From 35a6d1fc0191d465f5b2a1450e30da5786ba966a Mon Sep 17 00:00:00 2001 From: Steven Shiau Date: Tue, 16 Mar 2010 19:02:53 +0100 Subject: Moving select_eth_device from init-premount to live-premount where "udevadm" commands are not required. --- scripts/init-premount/select_eth_device | 101 -------------------------------- scripts/live-premount/select_eth_device | 97 ++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 101 deletions(-) delete mode 100755 scripts/init-premount/select_eth_device create mode 100755 scripts/live-premount/select_eth_device (limited to 'scripts') diff --git a/scripts/init-premount/select_eth_device b/scripts/init-premount/select_eth_device deleted file mode 100755 index 4258fba..0000000 --- a/scripts/init-premount/select_eth_device +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Original script by Andreas Teuchert -# Modified by Frédéric Boiteux - -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 - -# be sure this has been run (*should* be done by scripts/init-premount/udev) -udevadm trigger -udevadm settle - -# 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 diff --git a/scripts/live-premount/select_eth_device b/scripts/live-premount/select_eth_device new file mode 100755 index 0000000..dfeac3d --- /dev/null +++ b/scripts/live-premount/select_eth_device @@ -0,0 +1,97 @@ +#!/bin/sh + +# Original script by Andreas Teuchert +# Modified by Frédéric Boiteux + +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 -- cgit v1.2.3