Changeset 808 in MondoRescue for trunk/mindi

Timestamp:

Sep 22, 2006, 11:12:37 PM (19 years ago)

Author:

Bruno Cornec

Message:

merge -r793:807 $SVN_M/branches/stable
src => common for the moment it's easier to manage merges

Location:

trunk/mindi

Files:

• README.pxe (modified) (1 diff)
• distributions/debian/rules (modified) (1 diff)
• mindi (modified) (4 diffs)
• rootfs/sbin/start-nfs (modified) (4 diffs)

trunk/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=36864 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix="machine"] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=36864 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)

trunk/mindi/distributions/debian/rules

@@ -26 +26 @@
     dh_installdirs
     # Build the installation tree:
-    ( export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
+    ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
 
 # Build architecture-independent files here.

trunk/mindi/mindi

@@ -534 +534 @@
     local my_partitions i
     echo "MINDI_VERSION is $MINDI_VERSION" >> $LOGFILE
+    echo "End date : `date`" >> $LOGFILE
     if [ "$1" = "" ] ; then
-    LogIt "Fatal error\n"
-    else
-    LogIt "Fatal error. $1\n"
+        LogIt "Fatal error\n"
+    else
+        LogIt "Fatal error. $1\n"
     fi
     sync
@@ -1422 +1423 @@
             actual_dev=""
     
-            # 1st try : blkid, the good way for all LABEL
+            # 1st try : blkid, the good way for all LABEL except swap
             if [ -x "/sbin/blkid" ]; then
                 actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | /bin/cut -d':' -f1`
@@ -3022 +3023 @@
 echo "mindi called with the following arguments:" >> $LOGFILE
 echo "$@" >> $LOGFILE
+echo "Start date : `date`" >> $LOGFILE
 
 if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
@@ -3483 +3485 @@
 done
 echo "Mindi is exiting" >> $LOGFILE
+echo "End date : `date`" >> $LOGFILE
 exit 0

trunk/mindi/rootfs/sbin/start-nfs

@@ -3 +3 @@
 # $Id$
 #
-# This script set up the network + NFS environement if needed.
+# This script sets up the network + NFS environment if needed.
 #
 
@@ -17 +17 @@
 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 ipconf=""
-nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 if [ "$imgname" = "" ]; then
-    imgname="mondorescue"
+    export imgname="mondorescue"
 fi
-dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
-    dirimg="/"
+    export dirimg="/"
 fi
 
@@ -31 +31 @@
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
-    echo $i | grep -qi nfsmount= && nfsmount=`echo $i | cut -d= -f2`
-    echo $i | grep -qi prefix= && imgname=`echo $i | cut -d= -f2`
+    echo $i | grep -qi nfsmount= && export nfsmount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi prefix= && export imgname=`echo $i | cut -d= -f2`
 done
 
@@ -73 +73 @@
 mount -t nfs -o nolock $nfsmount /tmp/isodir
 
-LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
-losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
+LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+losetup /dev/loop7 /tmp/isodir/$dirimg/${imgname}-1.iso
 mount -o ro -t iso9660 /dev/loop7 /mnt/cdrom