Changeset 1312 in MondoRescue

Timestamp:

Apr 16, 2007, 1:05:53 AM (17 years ago)

Author:

Bruno Cornec

Message:

Suppress losetup usage in start-nfs (unreliable and doesn't work with QEMU)

Location:

branches/stable/mindi

Files:

• ChangeLog (modified) (1 diff)
• mindi (modified) (3 diffs)
• rootfs/sbin/start-nfs (modified) (1 diff)

branches/stable/mindi/ChangeLog

@@ -4 +4 @@
 
 1.2.2 (2007-04-15)
+- Suppress losetup usage in start-nfs (unreliable and doesn't work with QEMU (Bruno Cornec)
 - Fix a bug where losetup is called with only one parameter (#140) (Bruno Cornec)
 - Fix a bug on NFS in FC6 - fscache module needed (Bruno Cornec)

branches/stable/mindi/mindi

@@ -1813 +1813 @@
 
     tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz"
-    losetup /dev/loop0 > /dev/null 2> /dev/null
-    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary."
+    # BERLIOS : Useless and generating errors on CentOS ? (losetup miss a param)
+    #losetup /dev/loop0 > /dev/null 2> /dev/null
+    #[ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing 'losetup /dev/loop0 -d'.\nReboot if necessary."
     CopyBootBFile $mtpt/boot.b
 
@@ -1949 +1950 @@
     fi
     cd $old_pwd
-    losetup /dev/loop0 > /dev/null 2> /dev/null
-    [ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing   'losetup /dev/loop0 -d'.\nReboot if necessary."
+    # BERLIOS : Useless and generating errors on CentOS ? (losetup miss a param)
+    #losetup /dev/loop0 > /dev/null 2> /dev/null
+    #[ "$?" -eq "0" ] || losetup /dev/loop0 -d || Die "Please free up /dev/loop0 by typing   'losetup /dev/loop0 -d'.\nReboot if necessary."
     CopyBootBFile $mountpoint/boot.b
 
@@ -2774 +2776 @@
         # unmount loop filesystem and create image file using the standard approach
         umount $mountpoint || Die "Cannot unmount $tempfile"
-        dd if=$tempfile bs=1k 2> /dev/null | gzip -v9 > $rdz_fname 2> /dev/null
+        dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
+        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2`
+        ADDITIONAL_BOOT_PARAMS="$ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
+        gzip -v9 ${rdz_fname}.tmp > $rdz_fname 2> /dev/null
+        rm -f ${rdz_fname}.tmp
         # log that we are done
         echo "...done." >> $LOGFILE

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

@@ -74 +74 @@
 
 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
+mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom