Changeset 1621 in MondoRescue for branches/stable/mindi/rootfs/sbin/init

Timestamp:

Sep 7, 2007, 11:56:50 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix #194
• Fix #190 (veelo)
• Fix bug #189 (MarkNienberg)

(merge -r1599:1614 $SVN_M/branches/2.2.5 .)

File:

• branches/stable/mindi/rootfs/sbin/init (modified) (2 diffs)

branches/stable/mindi/rootfs/sbin/init

@@ -322 +322 @@
                 LogIt "$i is started already; no need to run 'mdadm $i'" 1
             else
-                LogIt "Running 'mdadm $i'" 1
-                mdadm -Ac partitions -m dev $i
+                if [ -f /etc/mdadm.conf ] ; then
+                    LogIt "Running 'mdadm $i' with user supplied /etc/mdadm.conf" 1
+                    mdadm -A $i -c /etc/mdadm.conf
+                elif [ -f /etc/mdadm/mdadm.conf ] ; then
+                    LogIt "Running 'mdadm $i' with user supplied /etc/mdadm/mdadm.conf" 1
+                    mdadm -A $i -c /etc/mdadm/mdadm.conf
+                else
+                    LogIt "Running 'mdadm $i'" 1
+                    mdadm -Ac partitions -m dev $i
+                fi
             fi
         done
@@ -558 +566 @@
     LogIt "I think this media has no archives on it."
 fi
-echo -en "Type 'exit' to reboot the PC\n"
-umount /mnt/cdrom 2> /dev/null
-mount / -o rw,remount > /dev/null 2> /dev/null
-LogIt "Launching Shell"
-sh
+if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
+    echo "Rebooting in 10 seconds automatically as per reboot order"
+    echo -en "Press ^C to interrupt if you have to ..."
+    for i in 1 2 3 4 5 6 7 8 9 10 ; do
+        sleep 1
+        echo -en "."
+    done
+    echo "Boom."
+    sleep 1
+else
+    echo -en "Type 'exit' to reboot the PC\n"
+    umount /mnt/cdrom 2> /dev/null
+    mount / -o rw,remount > /dev/null 2> /dev/null
+    LogIt "Launching Shell"
+    sh
+fi
 CaughtSoftReset
 # reboot