diff options
| author | Felix Endres | 2006-07-26 18:32:10 +0200 |
|---|---|---|
| committer | Felix Endres | 2006-07-26 18:32:10 +0200 |
| commit | 0798a9d4352ae5451434084322eaff7c28edd2ff (patch) | |
| tree | e954c254df0242e0ddaca28e76a55c9e24611c3d /initrd/initrd-stuff | |
| parent | Added function for URI interpretation, enabling URI notation for several (diff) | |
| download | core-0798a9d4352ae5451434084322eaff7c28edd2ff.tar.gz core-0798a9d4352ae5451434084322eaff7c28edd2ff.tar.xz core-0798a9d4352ae5451434084322eaff7c28edd2ff.zip | |
Mainly Fixes for Ubuntu 5.10
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@286 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff')
| -rwxr-xr-x | initrd/initrd-stuff/bin/dhcpmkconfig | 2 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig index bddb6b23..b2ef4e3a 100755 --- a/initrd/initrd-stuff/bin/dhcpmkconfig +++ b/initrd/initrd-stuff/bin/dhcpmkconfig @@ -18,6 +18,8 @@ able to\n# transfer any vendor specific, self defined dhcp options. If \ this is\n# intended, use dhclient instead or get them via tftp (to be \ enabled\n# via kernel command line)." # heavy debugging output in level 3 and above ... and on 13 +#FIXME: DEBUGLEVEL is not propagated to this file (at least for Ubuntu) +[ -z "$DEBUGLEVEL" ] && DEBUGLEVEL=0 [ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 10 -o $DEBUGLEVEL -eq 13 ] && \ set -x case $0 in diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 2686cfde..5160d93c 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -469,7 +469,7 @@ waitfor /tmp/svcfg 20000 || error "$init_errsw" # should be killed if started within init killall -9 dhcpcd dhclient pump 2>/dev/null cp /etc/machine-setup /mnt/etc - +#bash # post init for some distro specific postinit [ -x /bin/postinit.local ] && /bin/postinit.local |