Changeset 232 in MondoRescue

Timestamp:

Dec 17, 2005, 10:33:56 AM (18 years ago)

Author:

bcornec

Message:

Some echo during init and code cleanup

Location:

branches/2.05/mindi

Files:

• mindi (modified) (1 diff)
• rootfs/sbin/init (modified) (3 diffs)
• rootfs/sbin/post-init (modified) (3 diffs)

branches/2.05/mindi/mindi

@@ -1672 +1672 @@
     if [ "`DidMondoCallMe`" ] ; then
         if [ "$CDRECOVERY" != "yes" ] ; then
-                if [ -e "$MONDO_TMP/start-nfs" ] ; then
-                    echo -en "Press <enter> to continue.\n"
-        elif [ ! "$MONDO_TMP" ] ; then
-            echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
-                else
-                    echo -en "$BOOT_MEDIA_MESSAGE"
-                fi
+            if [ -e "$MONDO_TMP/start-nfs" ] ; then
+                echo -en "Press <enter> to continue.\n"
+            elif [ ! "$MONDO_TMP" ] ; then
+                echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
+            else
+                echo -en "$BOOT_MEDIA_MESSAGE"
+            fi
         fi
     fi

branches/2.05/mindi/rootfs/sbin/init

@@ -649 +649 @@
         # Simulate a local CD
         echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
+        CD_MOUNTED_OK=yes
     else
             HandleCDROMorFloppies
@@ -654 +655 @@
 fi
 res=$?
-echo "Please wait."
-insert-all-my-modules > /dev/null &
-sleep 7
+echo "Inserting modules ..."
+insert-all-my-modules > $LOGFILE 2> $LOGFILE
+echo "Installing additional tools ..."
 install-additional-tools
 SwapTheMountExecs
 ConfigureLoggingDaemons
-echo "Please wait."
-insert-all-my-modules &
-sleep 7
+echo "Inserting modules again ..."
+insert-all-my-modules > $LOGFILE 2> $LOGFILE
 if [ -e "/tmp/USE-DEVFS" ] ; then
     umount /mnt/cdrom 2> /dev/null
@@ -669 +669 @@
     RunDevfsd
 fi
+echo "Starting potential Raid/LVMs ..."
 PauseForRaids
 StartRaids

branches/2.05/mindi/rootfs/sbin/post-init

@@ -1 +1 @@
 #!/bin/sh
 #
+# $Id$
 #
-# 07/14/04
-# - if interactive then not expert :)
-#
-# 06/12/04
-# - tell user to call mondorestore --mbr after nuking
-#
-# 08/02/03
-# - don't call multifunc cd, even if it is one
-#
-# 05/30/03
-# - added hooks for multi-function CD
-#
-# 05/04/03
-# - better handling of mondorestore softlinks
-# - no more 'mondo-restore' --- it's 'mondorestore'
-#
-# 03/26/03
-# - report if mount-me, unmount-me, mondorestore missing
-# - call mondorestore instead of mondo-restore
-#
-# 07/15/02
-# - copy mountlist.txt to logfile at start
-#
-# 07/11/02
-# - exit w/o calling mondorestore, if non-mondo CD/floppy
-#
-# 06/28/02
-# - RESTORE == nuke_mode
-#
-# 06/24/02
-# - disabled isonuke
-#
-# 06/13/02
-# - added isonuke
-#
-# 02/03/02
-# - softlink mondo-restore -> mondorestore if mondorestore exists but m-r not
-#
-# 12/10/01
-# - removed the 'clear' from the start of the script
-#
-# 12/09/01
-# - broke up spaghetti code; made lots of subroutines
-# - moved some subroutines to /sbin/init, where they belong
 #------------------------------------------------------------
 
@@ -105 +62 @@
 nuke=`cat /proc/cmdline | grep "nuke"`
 if [ "$nuke" = "" ] ; then
-    nuke=`cat /proc/cmdline | grep "RESTORE "`
+    nuke=`cat /proc/cmdline | grep -i "RESTORE "`
 fi
 expert=`cat /proc/cmdline | grep "expert"`
@@ -148 +105 @@
 done
 
-#if [ "$iso" ] && [ "$nuke" ] ; then
-#    LogIt "------------------ISONUKE MODE-----------------" 1
-#    mondorestore --isonuke
-#el
-#if [ "$iso" ] ; then
-#    LogIt "--------------------ISO MODE-------------------" 1
-#    mondorestore --iso
-#el
 if [ "$compare" ] ; then
     LogIt "------------------COMPARE MODE-----------------" 1