Adding upstream version 1.173.5.

diff --git a/scripts/init-premount/select_eth_device b/scripts/init-premount/select_eth_device
index 6ab8bfe..4323880 100755 (executable)
--- a/scripts/init-premount/select_eth_device
+++ b/scripts/init-premount/select_eth_device
@@ -3,8 +3,6 @@
 # Original script by Andreas Teuchert <ant+dl@hsg-kl.de>
 # Modified by Frédéric Boiteux <fboiteux@calistel.com>
 
-
-
 PREREQ="blacklist udev"
 
 prereqs()
@@ -25,16 +23,28 @@ bootconf=$(egrep '^BOOT=' /conf/initramfs.conf | tail -1)
 
 # can be superseded by command line (used by Debian-Live's netboot for example)
 for ARGUMENT in $(cat /proc/cmdline); do
-    case "${ARGUMENT}" in
-        netboot=*)
-        NETBOOT="${ARGUMENT#netboot=}"
-        ;;
-    esac
+       case "${ARGUMENT}" in
+               netboot=*)
+                       NETBOOT="${ARGUMENT#netboot=}"
+                       ;;
+       esac
 done
 
 if [ "$bootconf" != "BOOT=nfs" ] && [ "$NETBOOT" = "" ]; then
-    # Not a net boot : nothing to do
-    exit 0
+       # Not a net boot : nothing to do
+       exit 0
+fi
+
+# be sure this has been run (*should* be done by scripts/init-premount/udev)
+if [ -x /sbin/udevadm ]
+then
+       # lenny
+       udevadm trigger
+       udevadm settle
+else
+       # etch
+       udevtrigger
+       udevsettle
 fi
 
 # we want to do some basic IP
@@ -44,34 +54,35 @@ modprobe -q af_packet
 l_interfaces=$(cd /sys/class/net/ && ls -d eth* 2>/dev/null)
 
 if [ $(echo $l_interfaces | wc -w) -lt 2 ]; then
-    # only one interface : no choice
-    echo "DEVICE=$l_interfaces" >> /conf/param.conf
-    exit 0
+       # only one interface : no choice
+       echo "DEVICE=$l_interfaces" >> /conf/param.conf
+       exit 0
 fi
 
 while true; do
-        echo -n "Looking for a connected Ethernet interface ..."
+       echo -n "Looking for a connected Ethernet interface ..."
 
        for interface in $l_interfaces; do
                # ATTR{carrier} is not set if this is not done
-                echo -n " $interface ?"
+               echo -n " $interface ?"
                ipconfig -c none -d $interface -t 1 >/dev/null 2>&1
-        done
-        echo ''
+       done
+
+       echo ''
 
-        for step in 1 2 3 4 5; do
-               for interface in $l_interfaces; do
-                        carrier=$(cat /sys/class/net/$interface/carrier \
-                                  2>/dev/null)
-                        # link detected
-                        if [ "$carrier" = 1 ]; then
-                                echo " found $interface."
-                                # inform initrd's init script :
-                                echo "DEVICE=$interface" >> /conf/param.conf
-                                exit 0
-                       fi
-               done
-                # wait a bit
-                sleep 1
-        done
+       for step in 1 2 3 4 5; do
+               for interface in $l_interfaces; do
+                       carrier=$(cat /sys/class/net/$interface/carrier \
+                               2>/dev/null)
+                       # link detected
+                       if [ "$carrier" = 1 ]; then
+                               echo " found $interface."
+                               # inform initrd's init script :
+                               echo "DEVICE=$interface" >> /conf/param.conf
+                               exit 0
+                       fi
+               done
+               # wait a bit
+               sleep 1
+       done
 done

diff --git a/scripts/live b/scripts/live
index d162f75..f79eaff 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -996,7 +996,7 @@ find_snap ()
        if [ "${PERSISTENT}" != "nofiles" ]
        then
                # search for image files
-               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4 ${snap_label}.jffs2")
+               snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2")
        fi
 
        if [ -z "${snapdata}" ]