diff options
| author | Dirk von Suchodoletz | 2007-03-23 14:42:22 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-03-23 14:42:22 +0100 |
| commit | 2b1809128a206f1fb41d4b6e27b706a044d4c25a (patch) | |
| tree | d1d9b764265e1d693147f3aa5852cee5ccce595d | |
| parent | Tribute to new VMware version 6 ... (diff) | |
| download | core-2b1809128a206f1fb41d4b6e27b706a044d4c25a.tar.gz core-2b1809128a206f1fb41d4b6e27b706a044d4c25a.tar.xz core-2b1809128a206f1fb41d4b6e27b706a044d4c25a.zip | |
Better handling of nfsv4 ... still to be improved (check combination
with krb)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@808 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 20 | ||||
| -rw-r--r-- | installer/default_files/machine-setup.default | 4 |
2 files changed, 15 insertions, 9 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index 47ce5b19..bc8dbff2 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -69,9 +69,9 @@ rllinker powersaved "11" "11" # policykitd (resource manager/policykitd - the user gets permissions to # devices when loggin on) config_dreshal () { -local start="05" -local stop="18" if [ "x$start_dreshal" = "xyes" ]; then + local start="05" + local stop="18" if [ -f /mnt/etc/${D_INITDIR}/dbus ] ; then strinfile "messagebus:" /mnt/etc/passwd || \ echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \ @@ -115,19 +115,21 @@ fi # config nfsv4 config_nfsv4 () { -testmkd /mnt/var/lib/nfs/rpc_pipefs -sed -e "s,NFS_SECURITY_GSS=.*,NFS_SECURITY_GSS=\"yes\"," \ +if [ "x$start_nfsv4" = "xyes" ]; then + 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\ + 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 echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \ /var/lib/nfs/rpc_pipefs\n\tmount -t nfsd nfsd /proc/fs/nfsd" \ >>/mnt/etc/${D_INITDIR}/boot.ld -# portmap is required for any NFS -config_portmap -rllinker "idmapd" "14" "08" -rllinker "gssd" "15" "07" + # portmap is required for any NFS + config_portmap + rllinker "idmapd" "14" "08" + rllinker "gssd" "15" "07" +fi } # prepare virtual machine environment (vmware, vmplayer) diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index f4ecdc1e..4f5b8529 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -84,6 +84,9 @@ start_alsasound="yes" start_samba="may" netbios_workgroup="dxs-network" +# nfs v4 +#start_nfsv4="no" + # automounter home (/local_dir - top level directories only) and source # (format (proto://)server/path) # if openslx server and server for the home is the same machine, you can @@ -91,6 +94,7 @@ netbios_workgroup="dxs-network" #automnt_dir="/home" #automnt_src="(proto://)serverip/home" + # scratch space on server "proto://serverip/slx/tmp" # if openslx server and server for the remote rw scratch is the same # machine, you can use @@@serverip@@@ instead of a fixed setting here |