[PATCH] Make select_eth_device work with 2nd NIC linked only and FETCH assigned
Hi,
Attached please find the patch to make select_eth_device work with 2nd
NIC linked only and d FETCH assigned.
The differences:
1. If it's in live-premount instead of init-premount, "udevadm" commands
are not required.
2. If user uses "FETCH", "HTTPFS", or "FTPFS", select_eth_device should
not exit since network is also required to get the filesystem.squashfs
3. Files in "/sys/class/net/" maybe not be up so quick, so it's better
to use a while loop to wait for that.
4. Another case is, for example, if eth0 and eth1 are linked, but only
eth1 is able to get filesystem.squashfs, the original select_eth_device
will try eth0 only. It's better to provide an alternative way to allow
user to specify the device in boot parameter. Here in the patch
live-netdev=eth1, for example, can be used to make it.
My 2 cents.
Hope this helps.
Steven.
--
Steven Shiau <steven _at_ nchc org tw> <steven _at_ stevenshiau org>
National Center for High-performance Computing, Taiwan.
http://www.nchc.org.tw
Public Key Server PGP Key ID: 1024D/9762755A
Fingerprint: A2A1 08B7 C22C 3D06 34DB F4BC 08B3 E3D7 9762 755A
diff --unified --new-file --recursive live-initramfs-1.173.5/scripts/init-premount/select_eth_device live-initramfs-1.173.5.new/scripts/init-premount/select_eth_device
--- live-initramfs-1.173.5/scripts/init-premount/select_eth_device 2010-03-15 05:51:39.000000000 +0800
+++ live-initramfs-1.173.5.new/scripts/init-premount/select_eth_device 1970-01-01 08:00:00.000000000 +0800
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Original script by Andreas Teuchert <ant+dl@hsg-kl.de>
-# Modified by Frédéric Boiteux <fboiteux@calistel.com>
-
-PREREQ="blacklist udev"
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# Boot type in initramfs's config
-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
-done
-
-if [ "$bootconf" != "BOOT=nfs" ] && [ "$NETBOOT" = "" ]; then
- # 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
-modprobe -q af_packet
-
-# Available Ethernet interfaces ?
-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
-fi
-
-while true; do
- 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 ?"
- ipconfig -c none -d $interface -t 1 >/dev/null 2>&1
- 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
-done
diff --unified --new-file --recursive live-initramfs-1.173.5/scripts/live-premount/select_eth_device live-initramfs-1.173.5.new/scripts/live-premount/select_eth_device
--- live-initramfs-1.173.5/scripts/live-premount/select_eth_device 1970-01-01 08:00:00.000000000 +0800
+++ live-initramfs-1.173.5.new/scripts/live-premount/select_eth_device 2010-03-15 16:00:24.572603000 +0800
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Original script by Andreas Teuchert <ant+dl@hsg-kl.de>
+# Modified by Frédéric Boiteux <fboiteux@calistel.com>
+
+PREREQ="blacklist udev"
+
+prereqs()
+{
+ echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+# Boot type in initramfs's config
+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
+done
+
+if [ "$bootconf" != "BOOT=nfs" ] &&
+ [ "$NETBOOT" = "" ] &&
+ [ "$FETCH" = "" ] &&
+ [ "$FTPFS" = "" ] &&
+ [ "$HTTPFS" = "" ]
+then
+ # Not a net boot : nothing to do
+ exit 0
+fi
+
+# we want to do some basic IP
+modprobe -q af_packet
+
+# Available Ethernet interfaces ?
+l_interfaces=""
+echo "Waiting for ethernet card(s) up... If this fails, maybe the ethernet card is not supported by the kernel `uname -r`?"
+while [ -z "$l_interfaces" ]; do
+ l_interfaces="$(cd /sys/class/net/ && ls -d eth* 2>/dev/null)"
+done
+
+if [ $(echo $l_interfaces | wc -w) -lt 2 ]; then
+ # only one interface : no choice
+ echo "DEVICE=$l_interfaces" >> /conf/param.conf
+ exit 0
+fi
+
+# If user force to use specific device, write it
+for ARGUMENT in $(cat /proc/cmdline); do
+ case "${ARGUMENT}" in
+ live-netdev=*)
+ NETDEV="${ARGUMENT#live-netdev=}"
+ echo "DEVICE=$NETDEV" >> /conf/param.conf
+ echo "Found live-netdev parameter in /proc/cmdline. Force to use network device $NETDEV."
+ exit 0
+ ;;
+ esac
+done
+
+while true; do
+ 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 ?"
+ ipconfig -c none -d $interface -t 1 >/dev/null 2>&1
+ 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
+done
Reply to: