summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/etc/functions
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-01-17 12:15:39 +0100
committerDirk von Suchodoletz2006-01-17 12:15:39 +0100
commit07be2c0ecf404f9c30ee42544539b39343f40a14 (patch)
tree4c6ae9e0425b0f95b2c0a10191131c3522fdf4aa /initrd/initrd-stuff/etc/functions
parentfunctions (fuer initrd) erweitert, so dass sinnvolle Fehlermeldungen (diff)
downloadcore-07be2c0ecf404f9c30ee42544539b39343f40a14.tar.gz
core-07be2c0ecf404f9c30ee42544539b39343f40a14.tar.xz
core-07be2c0ecf404f9c30ee42544539b39343f40a14.zip
dhclient schreibt jetzt Konfiguration sauber nach machine-setup. Laden
von Modulen durch hwautocfg geht wieder (bind-mount des Modulverz. wieder aktiv). servconfig leicht erweitert (acpi und powersave) ... git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@16 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/etc/functions')
-rw-r--r--initrd/initrd-stuff/etc/functions10
1 files changed, 5 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index b431e40e..30a142cf 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -138,7 +138,7 @@ option start-cron code 227\t\t= string;\n\
option crontab-entries code 228\t\t= string;\n\
option start-rwhod code 229\t\t= string;\n\
option start-printdaemon code 230\t= string;\n\
-option desktop-session code 231\t= string;\n\
+option desktop-session code 231\t\t= string;\n\
option tex-enable code 232\t\t= string;\n\
option netbios-workgroup code 233\t= string;\n\
option vmware code 234\t\t\t= string;\n\
@@ -146,7 +146,7 @@ option hw-mouse code 252\t\t= string;\n\
option hw-graphic code 253\t\t= string;\n\
option hw-monitor code 254\t\t= string;\n\n\
send dhcp-lease-time 86400;\nsend dhcp-max-message-size 1400;\n\
-request;\nscript \"/bin/dhclient-script\";" >> /etc/dhclient.conf
+request;\nscript \"/sbin/dhclient-script\";" >> /etc/dhclient.conf
if [ -n "$vci" ] ; then
echo "send vendor-class-identifier \"$vci\";" >> /etc/dhclient.conf
fi
@@ -172,19 +172,19 @@ else
loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \
"needed for dhcp";
echo "Starting $dhcp for configuration"
- mkdir /var/lib/dhcp 2&>1 >/dev/null
+ mkdir /var/lib/dhcp 2>&1 >/dev/null
fi
export client="$dhcp"
case $dhcp in
dhclient)
mkdhclconf $vci
ln -s /bin/dhcpmkconfig /sbin/dhclient-script
- dhclient -lf /var/lib/dhcp/dhclient.leases eth0 || \
+ dhclient -lf /var/lib/dhcp/dhclient.leases eth0 2>&1 >/dev/null || \
error " Fatal error occured while trying to run dhclient.\n$commonerr"
;;
dhcpcd)
ln -s /bin/dhcpmkconfig /sbin/dhcpd.exe
- dhcpcd -L /var/lib/dhcp -c /sbin/dhcpd.exe -T -t 30 eth0 || \
+ dhcpcd -L /var/lib/dhcp -c /sbin/dhcpd.exe -T -t 30 eth0 2>&1 >/dev/null || \
error " Fatal error occured while trying to run dhcpcd.\n$commonerr"
;;
pump)