Changeset 898 in MondoRescue

Timestamp:

Oct 23, 2006, 12:11:16 AM (18 years ago)

Author:

Bruno Cornec

Message:

init now gives which mindi version created it

Location:

branches/stable/mindi

Files:

• install.sh (modified) (1 diff)
• rootfs/sbin/init (modified) (4 diffs)

branches/stable/mindi/install.sh

@@ -52 +52 @@
 chmod 755 $locallib/mindi/aux-tools/sbin/*
 
+# Substirute variables for init
+perl -pi -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~ ; s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" $locallib/mindi/rootfs/sbin/init
+
+# Substirute variables for mindi
 if [ "$RPMBUILDMINDI" = "true" ]; then
     sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=/usr~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=/etc/mindi~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" mindi > $local/sbin/mindi

branches/stable/mindi/rootfs/sbin/init

@@ -158 +158 @@
     res=$?
     if [ "$res" -ne "0" ] ; then
-    LogIt "First call to find-and-mount-cdrom failed." 1
-    LogIt "Sleeping for 3 seconds and trying again." 1
-    sleep 3
-    find-and-mount-cdrom
-    res=$?
+        LogIt "First call to find-and-mount-cdrom failed." 1
+        LogIt "Sleeping for 3 seconds and trying again." 1
+        sleep 3
+        find-and-mount-cdrom
+        res=$?
     fi
     if [ "$res" -eq "0" ] ; then
-#        clear
-    LogIt "OK, I am running on a CD-ROM. Good." 3
+        LogIt "OK, I am running on a CD-ROM. Good." 3
         CD_MOUNTED_OK=yes
     elif [ "$res" -eq "1" ] ; then
-#        clear
-    LogIt "OK, I am running on floppies. Good." 3
-    CD_MOUNTED_OK=""
+        LogIt "OK, I am running on floppies. Good." 3
+        CD_MOUNTED_OK=""
     else
-    LogIt "OK, I am falling back to floppy mode." 3
+        LogIt "OK, I am falling back to floppy mode." 3
         LogIt "That means you'll have to copy the data disk images from" 3
         LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
@@ -180 +178 @@
         LogIt "on your hard disk. Your archives are probably fine but" 3
         LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
-    CD_MOUNTED_OK=""
+        CD_MOUNTED_OK=""
     fi
     return 0
@@ -422 +420 @@
 # ------------------------ main -----------------------
 
+MINDI_VER=VVV
+MINDI_REV=RRR
 trap CaughtSoftReset SIGTERM
 LOGFILE=/tmp/mondo-restore.log
@@ -428 +428 @@
 USER=root
 export PATH GROOVY USER
+
+echo "Welcome to init (from mindi ${MINDI_VER}-r${MINDI_REV}"
 
 mount -o remount rw /