Changeset 2951 in MondoRescue

Timestamp:

Feb 16, 2012, 3:18:39 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Force inclusion all all files mentioned in minimal.conf. This will allow easier support of additional features (such as rpcbind for NFS on RHEL 6.2)

Location:

branches/3.0/mindi

Files:

• deplist.d/minimal.conf (modified) (2 diffs)
• deplist.d/net.conf (modified) (1 diff)
• mindi (modified) (3 diffs)
• rootfs/etc/init.d/rcS (modified) (1 diff)
• rootfs/sbin/start-netfs (modified) (1 diff)

branches/3.0/mindi/deplist.d/minimal.conf

@@ -32 +32 @@
 /sbin/klogd
 /sbin/syslogd
+/sbin/rsyslogd
 # On ArchLinux
 /usr/sbin/syslog-ng
@@ -135 +136 @@
 /sbin/ifconfig
 /sbin/route
-/sbin/dhclient
-/var/lib/dhcp/dhclient.leases
-# On ArchLinnux
-/sbin/dhcpcd
-/var/lib/dhcpd
+/sbin/rpcbind
 
 # Busybox

branches/3.0/mindi/deplist.d/net.conf

@@ -8 +8 @@
 /usr/bin/scp
 
+# DHCP
+/sbin/dhclient
+/var/lib/dhcp/dhclient.leases
+# On ArchLinnux
+/sbin/dhcpcd
+/var/lib/dhcpd
+
 # Useful for debug
 /usr/sbin/ethtool

branches/3.0/mindi/mindi

@@ -1069 +1069 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
+    printf "        %-15s %-15s %-15s %-13s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1 tmpfs devpts sysfs proc debugfs"
     for c_p in $all_partitions ; do
@@ -2486 +2486 @@
 
     [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
-
-    # Handle the case where busybox and mount are dynamically linked
-    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
-    if [ $? -eq 0 ]; then
-        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
-        rm -f bin/mount $MINDI_TMP/busy.lis
-        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/busy.lis
-        # Special for libs
-        for f in `grep -E "libnss" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2`; do
-            echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
-        done
-        # Initial / are trucated by tar
-        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in mount analysis" $MINDI_TMP/$$.log
-        rm -f $MINDI_TMP/busy.lis
-    fi
-
+    
     # Copy of files mandatory for ssh to automate mount if sshfs is used
     mkdir $mountpoint/.ssh
@@ -2514 +2498 @@
     cp -rp /etc/ld.so.c* $mountpoint/etc
 
-    # Avoid an issue on some distro (RHEL5)
+    # Handle the case where busybox and mount are dynamically linked
+    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
+    if [ $? -eq 0 ]; then
+        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
+        rm -f bin/mount
+    fi
+
+    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
+    minimallis=`grep -Ev '^#' $DEPLIST_DIR/minimal.conf`
+    rm -f $MINDI_TMP/minimal.lis
+    for f in $MINDI_LIB/rootfs/bin/busybox $minimallis; do
+        echo $f >> $MINDI_TMP/minimal.lis
+    done
+    LocateDeps $MINDI_LIB/rootfs/bin/busybox $minimallis >> $MINDI_TMP/minimal.lis
+    for f in `cat $MINDI_TMP/minimal.lis`; do
+        echo "`ReadAllLink $f`" >> $MINDI_TMP/minimal.lis
+    done
+    # Initial / are trucated by tar
+    tar cf - `sort -u $MINDI_TMP/minimal.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in minimal analysis" $MINDI_TMP/$$.log
+    bash
+    rm -f $MINDI_TMP/minimal.lis
+
+    # Avoids an issue on some distro (RHEL5)
     rm -f $mountpoint/etc/ld.so.conf.d/kernelcap*
 

branches/3.0/mindi/rootfs/etc/init.d/rcS

@@ -709 +709 @@
 if [ -x /sbin/udevadm ]; then
     v=`/sbin/udevadm --version`
+    echo "Triggering udev again..."
     if [ "$v" -ge "146" ]; then
         /sbin/udevadm trigger --type=failed

branches/3.0/mindi/rootfs/sbin/start-netfs

@@ -105 +105 @@
         sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
     elif [ "$proto" != "" ]; then
+        if [ -x /sbin/rpcbind ]; then
+            "Startng rpcbind daemon..."
+            /sbin/rpcbind &
+        fi
         LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
         touch /etc/mtab