Started NFSv4 integration (only sensible for newer distros, e.g.

SuSE 10.), removed AFS from SuSE10.2 (deprecated), fixed init for
(nfsroot= deprecated too) and fixed functions for @@@serverip@@@
(dsuchod if --username dsuchod does not work)


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@709 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 15 insertions, 4 deletions

diff --git a/initramfs/initrd-stuff/bin/dhcpmkconfig b/initramfs/initrd-stuff/bin/dhcpmkconfig
index 0fd7583a..57f6ddee 100755
--- a/initramfs/initrd-stuff/bin/dhcpmkconfig
+++ b/initramfs/initrd-stuff/bin/dhcpmkconfig
@@ -29,6 +29,7 @@ case $0 in
     sed -e "s,',\",g;s,IPADDR,clientip,;s,NETMASK,subnet_mask," \
       -e "s,GATEWAY,gateway,;s,BROADCAST,broadcast_address," \
       -e "s,HOSTNAME,host_name,;s,DOMAIN,domain_name," \
+      -e "/=[^']/s/=\(.*\)/='\1'/;/DNS/s/,/ /;/NTPSERVERS/s/,/ /" \
       -e "s,ROOTPATH,root_path,;s,DNS,domain_name_servers," \
       -e "s,NTPSERVERS,ntp_servers,;s,DHCPSID,serverip," \
       -e "s,WINSSERVERS,netbios_name_servers," \
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index f92f11f4..7d0d3bea 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -275,6 +275,7 @@ config_snmp
 config_afs
 
 # setup nfsv4/krb stuff
+config_nfsv4
 
 #############################################################################
 # NIS
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 02a32b40..a193fb59 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -630,6 +630,9 @@ if ! test -f /tmp/cfgcomplete ; then
   for config in /tmp/confviadhcp /tmp/confviafile /tmp/confvialdap
     do test -f $config && cat $config >> /etc/machine-setup
   done
+# check again and replace @@@serverip@@@
+. /etc/machine-setup
+sed "s,@@@serverip@@@,$serverip," -i /etc/machine-setup
 echo "config completed" > /tmp/cfgcomplete
 fi
 }
@@ -1146,7 +1149,12 @@ config_nis () {
 :
 }
 
-# konfigure keyboard layout
+# configure nfsv4 stuff
+config_nfsv4 () {
+:
+}
+
+# configure keyboard layout
 keytable () {
 :
 }
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index dafc4b0e..eb777942 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -172,7 +172,7 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
           root_path=/$(uri_token $rootfs path)
           nfsserver=$(uri_token $rootfs server)
           echo -e "\n# nfs root information gotten via kernel command \
-line in $0\nnfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup
+line in $0\n#nfsroot=\"${nfsserver}:${root_path}\"\n" >> /etc/machine-setup
         ;;
         *nbd)
           nbdmod=$srvproto
@@ -204,8 +204,9 @@ line in $0\nnfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup
       nfsroot=${opts#nfsroot=}
       #root_path=
       #nfsserver=
-      echo -e "\n# nfs root information gotten via kernel command line in $0\n\
-nfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup
+      echo -e "\n# nfs root information gotten via kernel command line in \n\
+$0\n# deprecated: please use rootfs=nfs://...\nnfsroot=\"${nfsroot}\"\n" \
+>> /etc/machine-setup
     ;;
     # size of tempfs if not max. 50% of RAM should be used
     tmpfssize=*)