From 1cbb2ddde2cb09e2735ab372551945d17c3187b8 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Fri, 15 Dec 2006 22:29:56 +0000 Subject: Busybox had broken killall - fixed. Fixed replacement bug for udhcpc script, nameserver in resolv.conf is set properly now. git-svn-id: http://svn.openslx.org/svn/openslx/trunk@549 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/bin/dhcpmkconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'initramfs/initrd-stuff/bin') diff --git a/initramfs/initrd-stuff/bin/dhcpmkconfig b/initramfs/initrd-stuff/bin/dhcpmkconfig index d32bd8e6..86fd42c7 100755 --- a/initramfs/initrd-stuff/bin/dhcpmkconfig +++ b/initramfs/initrd-stuff/bin/dhcpmkconfig @@ -4,7 +4,7 @@ # clients used within OpenSLX initramfs. The result is written in unified # form to the /etc/machine-setup file # -# Dirk von Suchodoletz , 14-11-2006 +# Dirk von Suchodoletz , 15-12-2006 # Lars Mueller, 23-06-2006 # Oliver Tappe, 23-06-2006 # @@ -61,9 +61,8 @@ enabled via kernel command\n# line)." >>$cfgfile -e "s,^P.*,,;s,ntpsrv,ntp_servers,;s,ip,clientip," \ -e "s,serverid,serverip,;s,subnet,subnet_mask," \ -e "s,router,gateway,;s,hostname,host_name," \ - -e "s,dns,domain_name_servers,;s,domain,domain_name," \ + -e "s,domain,domain_name,;s,dns,domain_name_servers," \ -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \ >>/tmp/confviadhcp ;; esac - -- cgit v1.2.3-55-g7522