diff --git a/g5k-postinstall b/g5k-postinstall index 6f277ea64bced6e53235802d927c1ca7a280ac07..9611a0e0f30464237d3dc1fdbeca4385f316be53 100755 --- a/g5k-postinstall +++ b/g5k-postinstall @@ -73,12 +73,11 @@ Example: --net debian-bridged,traditional-names,hpc Valid tags for filesystems configuration in fstab: nfs include generic NFS mounts (/home with autofs, /grid5000) no-autofs do not use autofs, just mount the user's NFS directory - site-specific include site-specific NFS mounts (e.g. /softs) no-uuid do not use filesystem UUID to identify the partitions, use the block device filenames custom include custom mounts for custom partitionning. Need fstab file included in postinstall archive. -Example: --fstab nfs,site-specific +Example: --fstab nfs Valid modes for user restriction: std if deployed on production partition, restrict to root,oar. else, @@ -475,6 +474,7 @@ end ########################### fstab ##################################### $logger.info("Writing /etc/fstab (spec: #{$fstab.join(',')})") +#site-specific is not used anymore but we keep it for backwards compatibility fstab_bad = ( $fstab - [ 'nfs', 'no-autofs', 'site-specific', 'no-uuid', 'custom' ]) raise("Unknown fstab mode: #{fstab_bad.join(',')}") unless fstab_bad.empty? @@ -524,14 +524,6 @@ nfs:/export/grid5000 /grid5000 nfs #{$nfs_mount_options} 0 0 EOF end - # FIXME also convert to UUID.... - if $fstab.include?('site-specific') and MOUNTPOINTS[$mysite] != nil - fd.puts - fd.puts MOUNTPOINTS[$mysite]['fstab'] - MOUNTPOINTS[$mysite]['dirs'].each do |d| - FileUtils::mkdir_p("#{DSTDIR}#{d}") - end - end # FIXME also update NFS options there... if $fstab.include?('nfs') and $fstab.include?('no-autofs') user = get_node_current_user($mysite, $mycluster, $host)