diff options
| -rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 33 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/bin/dhcpmkconfig | 1 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 1 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 10 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 7 |
5 files changed, 27 insertions, 25 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index 0ec98e85..232edd57 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -112,27 +112,18 @@ if [ "x$start_dreshal" = "xyes" ]; then fi } -# afs client -# configure afs client -config_afs () { -if [ "x$start_afs" = "xyes" ] ; then - if [ -f /mnt/etc/init.d/openafs-client ] ; then - test -d /mnt/afs || error "${df_errafsd}" - testmkd /mnt/var/cache/openafs - rllinker "openafs-client" "15" "06" - # echo -e "# /etc/sysconfig/afs-client - file generated by \ - #$0:\n#\t$date\n" >/etc/sysconfig/afs-client.new; - # sed -e "s,THIS_CELL_SERVER.*,THIS_CELL_SERVER=\"$cell_serv\"," \ - # -e "s,PREFERREDSERVERS.*,PREFERREDSERVERS=\"$cell_serv\"," \ - # -e "s,THIS_CELL.*,THIS_CELL=\"$this_cell\"," \ - # -e "s,MEMCACHE.*,MEMCACHE=\"yes\"," \ - # /etc/sysconfig/afs-client >> \ - # /etc/sysconfig/afs-client.new - # mv /etc/sysconfig/afs-client.new /etc/sysconfig/afs-client - else - error "${df_errafsn}" nonfatal - fi -fi +# config nfsv4 +config_nfsv4 () { +testmkd /mnt/var/lib/nfs/rpc_pipefs +sed -e "s,NFS_SECURITY_GSS=.*,NFS_SECURITY_GSS=\"yes\"," \ + -e "s,NFS4_SUPPORT=.*,NFS4_SUPPORT=\"yes\"," \ + -i /mnt/etc/sysconfig/nfs +echo -e "rpc_pipefs\t/var/lib/nfs/rpc_pipefs rpc_pipefs defaults\t 0 0\n\ +nfsd\t\t/proc/fs/nfsd\tnfsd\t\tdefaults\t 0 0" >>/tmp/fstab +# portmap is required +config_portmap +rllinker "idmapd" "14" "08" +rllinker "gssd" "15" "07" } # prepare virtual machine environment (vmware, vmplayer) 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=*) |