From 985ffdcffaa555503e2e52d5a33eeed8d3426ccf Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Fri, 20 Jan 2023 12:19:49 +0100
Subject: [PATCH] clusterd: Remove obsolete code

---
 clusterd/clusterd | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/clusterd/clusterd b/clusterd/clusterd
index 2d2a736..b38a9e5 100755
--- a/clusterd/clusterd
+++ b/clusterd/clusterd
@@ -769,7 +769,6 @@ chomp($my_unixrev);
 
 our $CLUSTER_PW;
 our $CLUSTER_PW_FILE='/etc/clusterd.password';
-our $OLD_CLUSTER_PW_FILE='/root/clusterd.password';
 our $CLUSTER_PW_TIMESTAMP=0;
 
 $ENV{'PATH'} = '/usr/local/bin:/sbin:/usr/sbin:/bin'.($ENV{PATH}?':'.$ENV{PATH}:'');		# for ps , tar (gnu!)
@@ -1612,24 +1611,6 @@ sub send_tcp_cp {
 sub sync_cluster_pw {
 	my $st=Donald::FileInfo->lstat($CLUSTER_PW_FILE);
 
-	# upgrade : move cluster password file from /root to /etc
-
-	if (!$st && -e $OLD_CLUSTER_PW_FILE) {
-		warn "upgrading cluster password file location $OLD_CLUSTER_PW_FILE -> $CLUSTER_PW_FILE\n";
-		my $in=new IO::File $OLD_CLUSTER_PW_FILE,'<';
-		unless (defined $in) {warn "$OLD_CLUSTER_PW_FILE: $!\n";return undef;}
-		my $out=new IO::File $CLUSTER_PW_FILE,O_WRONLY|O_CREAT,0600;
-		unless (defined $out) {warn "$CLUSTER_PW_FILE: $!\n";return undef;}
-		my $data;
-		$in->read($data,1024);
-		$out->write($data);
-		$in->close;
-		$out->close;
-		$st=Donald::FileInfo->lstat($CLUSTER_PW_FILE);
-		defined $st or die "$CLUSTER_PW_FILE: $!\n";
-		unlink $OLD_CLUSTER_PW_FILE;
-	}
-
 	if ($st) {
 		if (!defined $CLUSTER_PW or $CLUSTER_PW_TIMESTAMP != $st->mtime) {
 			my $fh=new IO::File $CLUSTER_PW_FILE,'<';