Changeset 2329 in MondoRescue for branches/2.2.10/mindi/rootfs

Timestamp:

Aug 18, 2009, 3:20:46 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3340@localhost: bruno | 2009-08-12 00:17:29 +0200
Improve portability by defining all cmdline usage in 1 include (/tmp for FreeBSD and /proc fior LInux). Also doing tht for scripts.

Location:

branches/2.2.10/mindi/rootfs/sbin

Files:

• init (modified) (13 diffs)
• post-init (modified) (3 diffs)
• start-nfs (modified) (1 diff)
• start-usb (modified) (1 diff)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -5 +5 @@
 # init script launched during the restore process
 #------------------------------------------------------------
+
+if [ -e "/proc/cmdline" ]; then
+    export CMDLINE="/proc/cmdline"
+elif [ -e "/tmp/cmdline" ]; then
+    export CMDLINE="/tmp/cmdline"
+else
+    export CMDLINE="/dev/null"
+fi
+
 
 
@@ -327 +336 @@
     answer="NO"
 
-    grep -q nohw /proc/cmdline
+    grep -q nohw $CMDLINE
     if [ "$?" -eq 0 ]; then
         return
     fi
     if [ -x ./mindi-rsthw ]; then
-        grep -q RESTORE /proc/cmdline
+        grep -q RESTORE $CMDLINE
         if [ "$?" -ne 0 ]; then
             #clear
@@ -443 +452 @@
 
 StartMpath() {
-    if [ "`grep -i nompath /proc/cmdline`" ]; then
+    if [ "`grep -i nompath $CMDLINE`" ]; then
         return;
     fi
@@ -496 +505 @@
         done
     elif which dmraid > /dev/null 2> /dev/null ; then
-        if [ "`grep -i nodmraid /proc/cmdline`" ]; then
+        if [ "`grep -i nodmraid $CMDLINE`" ]; then
             return;
         fi
@@ -661 +670 @@
 rm -f /foozero
 
-if [ "`grep -i denymods /proc/cmdline`" ]; then
-    export DENY_MODS="`cat /proc/cmdline | sed 's~.*denymods=\"\(.*\)\".*~\1~'` mondonone"
+if [ "`grep -i denymods $CMDLINE`" ]; then
+    export DENY_MODS="`cat $CMDLINE | sed 's~.*denymods=\"\(.*\)\".*~\1~'` mondonone"
 else
     export DENY_MODS=" "
@@ -670 +679 @@
     export DENY_MODS="usb-storage $DENY_MODS"
 fi
-if [ "`grep -i forcemods /proc/cmdline`" ]; then
-    export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
+if [ "`grep -i forcemods $CMDLINE`" ]; then
+    export FORCE_MODS="`cat $CMDLINE | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
 else
     export FORCE_MODS=" "
@@ -707 +716 @@
     LogIt "Warning - /tmp/mondo-restore.cfg not found"
 fi
-if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ]; then
+if [ "`grep -i pxe $CMDLINE`" ] || [ "`grep -i net $CMDLINE`" ]; then
     # We need to get here exported variables from start-nfs
     . /sbin/start-nfs
@@ -715 +724 @@
     HandleTape
     ExtractDataDisksAndLoadModules
-elif [ "`grep -i pxe /proc/cmdline`" ]; then
+elif [ "`grep -i pxe $CMDLINE`" ]; then
     # Simulate a local CD
     echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
@@ -722 +731 @@
     # Fake the conf file to force it to NFS mode, even if we made originally a CD (mandatory for mondorestore to work correctly)
     sed -i "s/backup-media-type.*/backup-media-type nfs/" /tmp/mondo-restore.cfg
-elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
+elif [ "`grep -i usb= $CMDLINE`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb
 
@@ -764 +773 @@
 [ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
 
-if ! [ "`grep -i "pxe" /proc/cmdline`" ] ; then
+if ! [ "`grep -i "pxe" $CMDLINE`" ] ; then
     res="`cat /mnt/cdrom/archives/THIS-CD-NUMBER 2> /dev/null`"
     [ "$res" != "1" ] && [ "$res" != "" ] && Die "This is CD #$res in the series. Please insert CD #1."
@@ -775 +784 @@
 # Log some useful info
 LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV})"
-LogIt "/proc/cmdline is:"
-cat /proc/cmdline  >> $LOGFILE
+LogIt "$CMDLINE is:"
+cat $CMDLINE  >> $LOGFILE
 LogIt "df result:"
 LogIt "----------"
@@ -841 +850 @@
     LogIt "I think this media has no archives on it."
 fi
-if [ "`grep -i "post=" /proc/cmdline`" ] ; then
-    for i in `cat /proc/cmdline` ; do
+if [ "`grep -i "post=" $CMDLINE`" ] ; then
+    for i in `cat $CMDLINE` ; do
         echo $i | grep -qi post= && post=`echo $i | cut -d= -f2`
     done
@@ -861 +870 @@
     fi
 fi
-if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
+if grep "RESTORE" $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 ..."

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

@@ -5 +5 @@
 #------------------------------------------------------------
 
-
 sleep 1
 
@@ -11 +10 @@
 cat /tmp/mountlist.txt >> $LOGFILE
 
-iso=`grep iso /proc/cmdline`
-nuke=`grep nuke /proc/cmdline`
+iso=`grep iso $CMDLINE`
+nuke=`grep nuke $CMDLINE`
 if [ "$nuke" = "" ] ; then
-    nuke=`grep -i "RESTORE " /proc/cmdline`
+    nuke=`grep -i "RESTORE " $CMDLINE`
 fi
-expert=`grep expert /proc/cmdline`
-compare=`grep compare /proc/cmdline`
-interactive=`grep interactive /proc/cmdline`
-pxe=`grep pxe /proc/cmdline`
+expert=`grep expert $CMDLINE`
+compare=`grep compare $CMDLINE`
+interactive=`grep interactive $CMDLINE`
+pxe=`grep pxe $CMDLINE`
 [ "$interactive" ]  && expert=""; # in case 'expert' crops up somewhere
 if which mondorestore > /dev/null 2> /dev/null ; then
@@ -62 +61 @@
 fi
 
-if [ "`grep -i 'debug' /proc/cmdline`" ]; then
+if [ "`grep -i 'debug' $CMDLINE`" ]; then
     mondoopt="$mondoopt -K 99"
 fi

branches/2.2.10/mindi/rootfs/sbin/start-nfs

@@ -30 +30 @@
 
 # info from cmdline are predominent
-for i in `cat /proc/cmdline` ; do
+for i in `cat $CMDLINE` ; do
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`

branches/2.2.10/mindi/rootfs/sbin/start-usb

@@ -10 +10 @@
 
 # info from cmdline are predominent
-for i in `cat /proc/cmdline` ; do
+for i in `cat $CMDLINE` ; do
     echo $i | grep -qi usb= && MRUSBDEV=`echo $i | cut -d= -f2`
 done