Changeset 2888 in MondoRescue for branches

Timestamp:

Oct 11, 2011, 6:56:35 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Try to Fix #499 by changing init in order to never exit, and rebooting using sysrq in /proc (not portable). Maybe should move to using a real init, and a separated rcS script.
• Fixes the shell msg error by using setsid as per Busybox FAQ

Location:

branches/2.2.9

Files:

• mindi-busybox/.config (modified) (3 diffs)
• mindi/rootfs/sbin/init (modified) (5 diffs)
• mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)

branches/2.2.9/mindi-busybox/.config

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.3-rPBREV
-# Sat Jun 11 21:02:21 2011
+# Busybox version: 1.18.5-rPBREV
+# Mon Oct 10 13:13:24 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
@@ -582 +582 @@
 CONFIG_SWAPONOFF=y
 CONFIG_FEATURE_SWAPON_PRI=y
-# CONFIG_SWITCH_ROOT is not set
+CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -691 +691 @@
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
-# CONFIG_SETSID is not set
+CONFIG_SETSID=y
 CONFIG_STRINGS=y
 # CONFIG_TASKSET is not set

branches/2.2.9/mindi/rootfs/sbin/init

@@ -9 +9 @@
 CaughtSoftReset() {
     trap SIGTERM
-    reboot -f
+    # Now kill all processes
+    kill -TERM -1
+    sync
+    sleep 1
+    kill -KILL -1
+    sync
+    # Try to umount what we can again 
+    umount -a -d -r 2> /dev/null
+    # now reboot hard
+    # This doesn't work nor does reboot
+    # ctrlaltdel hard &
+    # reboot -f
+    echo s > /proc/sysrq-trigger
+    echo u > /proc/sysrq-trigger
+    echo b > /proc/sysrq-trigger
+    # That script should never end
+    while [ "1" == "1" ]; do
+        sleep 10
+    done
 }
 
@@ -47 +65 @@
 
 
+GetShell() {
+    echo -en "Type 'exit' to reboot the PC\n"
+    umount -d /mnt/cdrom 2> /dev/null
+    mount / -o rw,remount > /dev/null 2> /dev/null
+    LogIt "Launching Shell"
+    setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+}
+
 
 Die() {
     LogIt "Fatal error! $1" 1
-    exit 1
-}
-
+    GetShell
+}
 
 
@@ -698 +723 @@
 ExtractDataDisksAndLoadModules() {
     LogIt "Installing additional tools ..." 1
+    # BCO: test return value
     install-additional-tools
     # Keep the kernel silent again
@@ -717 +743 @@
 MINDI_REV=PBREV
 trap CaughtSoftReset SIGTERM
+trap GetShell SIGINTR
 LOGFILE=/var/log/mondorestore.log
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/mondo:/usr/games
@@ -963 +990 @@
     sleep 1
 else
-    echo -en "Type 'exit' to reboot the PC\n"
-    umount -d /mnt/cdrom 2> /dev/null
-    mount / -o rw,remount > /dev/null 2> /dev/null
-    LogIt "Launching Shell"
-    sh
+    GetShell
 fi
 CaughtSoftReset
-# reboot

branches/2.2.9/mindi/rootfs/sbin/install-additional-tools

@@ -4 +4 @@
 #
 ########################################################################
-
-
-Die() {
-    echo "Fatal error! $1" >> /dev/stderr
-    exit 1
-}
-