Changeset 309 in MondoRescue for trunk/mindi

Timestamp:

Jan 13, 2006, 12:23:00 AM (19 years ago)

Author:

bcornec

Message:

merge -r303:308 $SVN_M/branches/2.06

Location:

trunk/mindi

Files:

• aux-tools/sbin/format-and-kludge-vfat (modified) (1 diff)
• distributions (copied) (copied from branches/2.06/mindi/distributions )
• install.sh (modified) (4 diffs)
• mindi (modified) (5 diffs)
• rootfs/sbin/init (modified) (1 diff)

trunk/mindi/aux-tools/sbin/format-and-kludge-vfat

@@ -107 +107 @@
 [ ! -e "/mnt/tmpK" ] && mkdir /mnt/tmpK
 mount $device -t vfat /mnt/tmpK || Die "Can't mount device $device"
-size=`df -m /mnt/tmpK | tr -s ' ' ' ' | cut -d' ' -f2 | tail -n 1`
+size=`df -m -P /mnt/tmpK | tr -s ' ' ' ' | cut -d' ' -f2 | tail -n 1`
 umount /mnt/tmpK || Die "Can't unmount /mnt/tmpK"
 

trunk/mindi/install.sh

@@ -34 +34 @@
 MANDIR=$local/share/man/man8
 
+ARCH=`/bin/arch`
+echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386 && locallib=$local/lib
+# For the moment, we don't build specific x86_64 busybox binaries
+echo $ARCH | grep -x "x86_64" &> /dev/null && ARCH=i386 && locallib=$local/lib64
+export ARCH
+
 echo "Creating target directories ..."
-install -m 755 -d $conf $local/lib/mindi $MANDIR $local/sbin $DOCDIR
+install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR
 
 echo "Copying files ..."
-install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $local/lib/mindi
+install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
 install -m 644 deplist.txt $conf
 
-cp -af rootfs aux-tools Mindi $local/lib/mindi
-chmod 755 $local/lib/mindi/rootfs/bin/*
-chmod 755 $local/lib/mindi/rootfs/sbin/*
-chmod 755 $local/lib/mindi/aux-tools/sbin/*
+cp -af rootfs aux-tools Mindi $locallib/mindi
+chmod 755 $locallib/mindi/rootfs/bin/*
+chmod 755 $locallib/mindi/rootfs/sbin/*
+chmod 755 $locallib/mindi/aux-tools/sbin/*
 
 if [ "$RPMBUILDMINDI" = "true" ]; then
@@ -57 +63 @@
 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
 
-ARCH=`/bin/arch`
-echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386
-# For the moment, we don't build specific x86_64 busybox binaries
-echo $ARCH | grep -x "x86_64" &> /dev/null && ARCH=i386
-export ARCH
-
 # Managing busybox
-if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH ]; then
+if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH ]; then
         echo "Installing busybox ..."
-        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH $local/lib/mindi/rootfs/bin/busybox
+        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH $locallib/mindi/rootfs/bin/busybox
 else
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi
 if [ "$ARCH" = "i386" ] ; then
-    if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
+    if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
         echo "Installing busybox.net ..."
-        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH.net $local/lib/mindi/rootfs/bin/busybox.net
+        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH.net $locallib/mindi/rootfs/bin/busybox.net
     else
         echo "WARNING: no busybox.net found, mindi will not work on this arch ($ARCH) with network"
@@ -79 +79 @@
 fi
 # Remove left busybox
-rm -f $local/lib/mindi/rootfs/bin/busybox-*
+rm -f $locallib/mindi/rootfs/bin/busybox-*
 
 # Managing parted2fdisk
 if [ "$ARCH" = "ia64" ] ; then
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
-    make -f Makefile.parted2fdisk DEST=$local/lib/mindi install
-    if [ -f $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
+    make -f Makefile.parted2fdisk DEST=$locallib/mindi install
+    if [ -f $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
         echo "Installing parted2fdisk ..."
-        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/lib/mindi/rootfs/sbin/parted2fdisk
-        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
+        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $locallib/mindi/rootfs/sbin/parted2fdisk
+        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
     else
         echo "WARNING: no parted2fdisk found, mindi will not work on this arch ($ARCH)"
@@ -96 +96 @@
     (cd $local/sbin && ln -sf /sbin/fdisk parted2fdisk)
     echo "Symlinking fdisk to parted2fdisk"
-    ( cd $local/lib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
+    ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
 fi
 # Remove left parted2fdisk
-rm -f $local/lib/mindi/rootfs/sbin/parted2fdisk-*
+rm -f $locallib/mindi/rootfs/sbin/parted2fdisk-*
 
 if [ "$RPMBUILDMINDI" != "true" ]; then
-    chown -R root:root $local/lib/mindi $conf $DOCDIR
+    chown -R root:root $locallib/mindi $conf $DOCDIR
     chown root:root $local/sbin/mindi $MANDIR/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then

trunk/mindi/mindi

@@ -1901 +1901 @@
     rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
-    free_space=`df -k $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     cp -f $kernelpath $mountpoint/vmlinuz > /dev/null 2> /dev/null
     if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
@@ -1924 +1924 @@
     return $res
     fi
-    free_space=`df -k $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
     echo "Free space left on floppy = $free_space KB" >> $LOGFILE
@@ -2038 +2038 @@
     rm -Rf $mountpoint/lost+found
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
-    free_space=`df -k $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
     if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
@@ -2061 +2061 @@
         return $res
     fi
-    free_space=`df -k $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
+    free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
     max_kernel_size=$(($free_space+`du -sk $kernelpath | cut -f1`))
     echo "Free space left on floppy = $free_space KB" >> $LOGFILE
@@ -2410 +2410 @@
     echo "------- $FDISK log end ------------" >> $LOGFILE
 # end patch
-    [ "$res" = "" ] && res=`df -k -x supermount | tr -s '\t' ' ' | fgrep "$device " | cut -d' ' -f2`
+    [ "$res" = "" ] && res=`df -k -P -x supermount | tr -s '\t' ' ' | fgrep "$device " | cut -d' ' -f2`
     [ "$res" = "" ] && res="-1"
     echo $res

trunk/mindi/rootfs/sbin/init

@@ -342 +342 @@
 
 HowMuchFreeSpaceOnRamdisk() {
-   df -m | grep /dev/ram | head -n1 | tr -s '\t' ' ' | cut -d' ' -f4
+   df -m -P | grep /dev/ram | head -n1 | tr -s '\t' ' ' | cut -d' ' -f4
 }