From 39abdebccc6ce64d9651283caace46bc2842aada Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 22 Nov 2021 18:28:05 +0100 Subject: [PATCH] make-automaps: Remove isi2 special code There is some special coding for projects which used to be on isi2, so that some clients used special interfaces of the isi2 system. This code is obsolete, because all projects have been moved away from isi2. For these moved projects, wrong entries with the same key are created in the amd.project map. This didn't cause problems, because automount uses the first entry in the map file. The only project, which has not been removed until now is solexawork30: # grep solexawork30 /etc/automount/auto.project solexawork30 buttstallion:/amd/buttstallion/M/M8039/project/solexawork30 solexawork30 isi2-10g-06:/ifs/project/solexawork30 # df /project/solexawork30 Filesystem 1K-blocks Used Available Use% Mounted on buttstallion:/amd/buttstallion/M/M8039/project/solexawork30 109392431104 100384577536 9007853568 92% /project/solexawork30 Remove obsolete code. --- make-automaps/make-automaps | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/make-automaps/make-automaps b/make-automaps/make-automaps index d8fec99..4cbae46 100755 --- a/make-automaps/make-automaps +++ b/make-automaps/make-automaps @@ -57,9 +57,7 @@ sub parse_jbod_line { return undef; } -our %ISI_D=(eiapopeia=>'isi2-10g-01',enemenemuh=>'isi2-10g-02',simsalabimbambasaladusaladim=>'isi2-10g-03'); -our @ISI_P=qw(galaxy ES-E14 solexadata04 solexawork30); -our %IGNORE=map{$_=>1} qw(ftpadm ftp ftpin wwwcmb postgresdata mysqldata kde qt xfce bigblast mzsqldb sge sge6-2 drvault),@ISI_P; +our %IGNORE=map{$_=>1} qw(ftpadm ftp ftpin wwwcmb postgresdata mysqldata kde qt xfce bigblast mzsqldb sge sge6-2 drvault); sub parse_map_line { my ($in,$source)=@_; @@ -148,18 +146,6 @@ local9 :/amd/$hostname/S9/scratch local10 :/amd/$hostname/S10/scratch eof -######################################## /project - -open O,'>>','/etc/automount/auto.project' or die "/etc/automount/auto.project: $!\n"; - -for my $p (@ISI_P) { - if (exists ($ISI_D{$hostname})) { - print O "$p $ISI_D{$hostname}:/ifs/project/$p\n"; - } else { - print O "$p isi2-10g-06:/ifs/project/$p\n"; - } -} - ######################################## /package open O,'>>','/etc/automount/auto.package' or die "/etc/automount/auto.package: $!\n";