diff options
| author | Dirk von Suchodoletz | 2006-06-30 01:27:12 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-06-30 01:27:12 +0200 |
| commit | ac5635ae692d39c7fe837155651049d432c93333 (patch) | |
| tree | c3d34fbbc5f219fb8110d75595628e9e8bcbfbe3 /initrd/initrd-stuff/etc | |
| parent | bootsplash bugfix (diff) | |
| download | core-ac5635ae692d39c7fe837155651049d432c93333.tar.gz core-ac5635ae692d39c7fe837155651049d432c93333.tar.xz core-ac5635ae692d39c7fe837155651049d432c93333.zip | |
Initial support for busybox, update of hwsetup and hw configuration data
...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@262 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/etc')
| -rw-r--r-- | initrd/initrd-stuff/etc/functions | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions index 5ae2927a..8565281c 100644 --- a/initrd/initrd-stuff/etc/functions +++ b/initrd/initrd-stuff/etc/functions @@ -198,6 +198,7 @@ case $mnt in ;; mount) portmap || { echo "$error_portm"; ret=1; } + # fixme: busybox mount uses nfs ... mount -n -t nfs -o ro,nolock $nfsroot $dest || ret=1 killall -9 portmap ;; @@ -241,8 +242,8 @@ fi rundhcp () { local vci="$1" -for dhcp in dhclient dhcpcd pump ipconfig none; do - test -x /bin/$dhcp && break; +for dhcp in dhclient dhcpcd pump ipconfig udhcpc none; do + test -e /bin/$dhcp && break; done if [ "$dhcp" = "none" ] ; then error "$error_nodhcp" nonfatal @@ -264,9 +265,10 @@ case $dhcp in 2>&1 >/dev/null || error "$error_dhclient" ;; dhcpcd) + [ -n $vci ] && vci="-i $vci" ln -s /bin/dhcpmkconfig /bin/dhcpcd.exe - dhcpcd -L /var/lib/dhcp -c /bin/dhcpcd.exe -T -t 30 eth0 2>&1 >/dev/null \ - || error "$error_dhcpcd" + dhcpcd $vci -L /var/lib/dhcp -c /bin/dhcpcd.exe -T -t 30 eth0 \ + 2>&1 >/dev/null || error "$error_dhcpcd" ;; pump) error "$error_pump" @@ -279,6 +281,12 @@ way. use dhclient instead or get them via\n# tftp (to be enabled via kernel \ command line)." >> /etc/machine-setup error "$error_ipconf" ;; + # udhcpc is part of busybox + udhcpc) + [ -n $vci ] && vci="-V $vci" + ln -s /bin/dhcpmkconfig /bin/udhcpc.script + udhcpc -b -q $vci -s /bin/udhcpc.script -i eth0 + ;; *) ;; esac @@ -733,7 +741,7 @@ done ####################################################################### # dummy functions -#overwrite xorg configuration set by hwautocfg +# overwrite xorg configuration set by hwautocfg displayvars (){ : } |