[Astlinux-commits] SF.net SVN: astlinux:[7374] branches/1.0/project/astlinux/target_skeleton/ sbin/kernel-reboot

[<abe...@us...>]

Revision: 7374
          http://sourceforge.net/p/astlinux/code/7374
Author:   abelbeck
Date:     2015-12-06 16:18:49 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
kernel-reboot, add some output text per Michael's suggestions

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot

Modified: branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-05 14:21:21 UTC (rev 7373)
+++ branches/1.0/project/astlinux/target_skeleton/sbin/kernel-reboot	2015-12-06 16:18:49 UTC (rev 7374)
@@ -22,7 +22,8 @@
 
 do_failure()
 {
-  reboot -f
+  echo '## Falling back to /sbin/reboot ##'
+  /sbin/reboot -f
   exit 1
 }
 
@@ -31,6 +32,8 @@
   # Stop services and unmount all file systems or remount 'ro' if busy
   /etc/rc shutdown
 
+  echo '## Using /sbin/kernel-reboot ##'
+
   # Stop udevd since /dev is now 'ro'
   echo "Stopping udevd..."
   udevadm control --timeout=121 --exit
@@ -58,7 +61,7 @@
       mount -t vfat -o ro "$LABEL" $BASE
     fi
     if ! mount | grep -q "$BASE"; then
-      echo "Unable to find Runnix partition."
+      echo "Unable to find RUNNIX partition."
       do_failure
     fi
   fi
@@ -166,14 +169,14 @@
 cd /root
 
 if [ ! -x /sbin/kexec ]; then
-  echo "kernel-reboot: You don't have kexec-tools installed - rebooting" >&2
-  reboot
+  echo "kernel-reboot: You don't have kexec-tools installed, falling back to /sbin/reboot" >&2
+  /sbin/reboot
   exit 1
 fi
 
 if [ ! -x /sbin/findfs ]; then
-  echo "kernel-reboot: You don't have findfs installed - rebooting" >&2
-  reboot
+  echo "kernel-reboot: You don't have findfs installed, falling back to /sbin/reboot" >&2
+  /sbin/reboot
   exit 1
 fi
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.