diff options
| author | Dirk von Suchodoletz | 2008-08-24 00:38:22 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-08-24 00:38:22 +0200 |
| commit | 08d6911d53a5dc626ca9b1a6e97b4532a7e626d0 (patch) | |
| tree | ef5f9e44cc4f13ba7a515d2f1f9399a9891f6ea2 | |
| parent | Introduction of a debug shell from runlevel 3 on, see DebugLevel. (diff) | |
| download | core-08d6911d53a5dc626ca9b1a6e97b4532a7e626d0.tar.gz core-08d6911d53a5dc626ca9b1a6e97b4532a7e626d0.tar.xz core-08d6911d53a5dc626ca9b1a6e97b4532a7e626d0.zip | |
Problems reported by Reiner hopefully fixed (nis, see #265).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2088 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | initramfs/stage3-stuff/bin/dhcpmkconfig | 3 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/servconfig | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/initramfs/stage3-stuff/bin/dhcpmkconfig b/initramfs/stage3-stuff/bin/dhcpmkconfig index 66f16371..dd4b704a 100755 --- a/initramfs/stage3-stuff/bin/dhcpmkconfig +++ b/initramfs/stage3-stuff/bin/dhcpmkconfig @@ -28,4 +28,5 @@ set | sed \ -e "s,router,gateway,;s,hostname,host_name," \ -e "s,domain,domain_name,;s,dns,domain_name_servers," \ -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \ - -e "/OPTIND.*/d" >>/tmp/confviadhcp + -e "s,nissrv,nis_servers,;s,nisdomain_name,nis_domain," \ + -e "s,wins,netbios_name_servers,;/OPTIND.*/d" >>/tmp/confviadhcp diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig index 6885e687..23d5dbee 100755 --- a/initramfs/stage3-stuff/bin/servconfig +++ b/initramfs/stage3-stuff/bin/servconfig @@ -92,7 +92,7 @@ localization "${country}" ############################################################################# # setup passwd and shadow for local system users like root, bin, daemon and # nobody if no user/admin provided passwd exists ... fixme: see #206 -basepasswd $(sed "/+::0/d;s/root://;s/:.*//" /rootfs/etc/shadow) +basepasswd $(sed "/+::0/d;s/root://;s/:.*//" /rootfs/etc/shadow 2>/dev/null) ############################################################################# # dns and ip configuration @@ -236,7 +236,7 @@ config_nfsv4 config_samba ############################################################################# -# NIS +# NIS (variable typically fetched via dhcp) # setup nis configuration if needed if [ "x$nis_domain" != "x" ] && [ "x$nis_servers" != "x" ] ; then echo $nis_domain >/mnt/etc/defaultdomain |