Make errors and the beginning of rollback a little more obvious; people

were overlooking which line was the real failure.

diff --git a/debian/afs-newcell b/debian/afs-newcell
index 1c9d7a809b65d71ea4cf57b1d7fdb57baad03cab..579c4976fdd7b2e4d7e3e082367aa9e95e826b14 100644 (file)
--- a/debian/afs-newcell
+++ b/debian/afs-newcell
@@ -120,6 +120,7 @@ $server = `hostname -f`;
 chomp $server;
 my $ip = gethostbyname $server;
 if (inet_ntoa($ip) eq '127.0.0.1') {
+    print "\n";
     print "Your hostname $server resolves to 127.0.0.1, which AFS cannot\n";
     print "cope with.  Make sure your hostname resolves to a non-loopback\n";
     print "IP address.  (Check /etc/hosts and make sure that your hostname\n";
@@ -164,6 +165,7 @@ while (<CELLSERVDB>) {
     last;
 }
 unless ($found) {
+    print "\n";
     print "The new cell $cell is not configured in /etc/openafs/CellServDB\n";
     print "Add configuration like:\n\n>$cell\n$ip\n\nto that file before"
         . " continuing.\n";
@@ -193,7 +195,12 @@ unwind("bos removeuser $server $afs_admin -localauth");
 # the standard mechanism of starting the cell in noauth mode until the first
 # user has been created.
 if (-f "/var/lib/openafs/db/prdb.DB0") {
-    die "Protection database already exists; cell already partially created\n";
+    warn "ERROR: Protection database already exists; cell already partially"
+        . " created\n";
+    warn "ERROR: If you do not want the current database, remove all files
+        . " in\n";
+    warn "ERROR: /var/lib/openafs/db and then run this program again.\n";
+    exit(1);
 }
 open(PRDB, "| pt_util -p /var/lib/openafs/db/prdb.DB0 -w")
     or die "Unable to start pt_util: $!\n";
@@ -230,22 +237,22 @@ run("vos create $server a root.afs -localauth");
 # if not using dynroot).  We override whatever default cell was configured for
 # the client, just in case it was pointing to some other cell.
 open(THIS, "> /etc/openafs/ThisCell")
-    or die "Cannot create /etc/openafs/ThisCell: $!\n";
+    or die "ERROR: Cannot create /etc/openafs/ThisCell: $!\n";
 print THIS "$cell\n";
-close THIS or die "Cannot write to /etc/openafs/ThisCell: $!\n";
+close THIS or die "ERROR: Cannot write to /etc/openafs/ThisCell: $!\n";
 run("/etc/init.d/openafs-client force-start");
 
 # Verify that AFS has managed to start.
 my $afs_running = 0;
-open(MOUNT, "mount |") or die "Failed to run mount: $!\n";
+open(MOUNT, "mount |") or die "ERROR: Failed to run mount: $!\n";
 while(<MOUNT>) {
     if (m:^AFS:) {
         $afs_running = 1;
     }
 }
 unless ($afs_running) {
-    print "The AFS client failed to start.\n";
-    print "Please fix whatever problem kept it from running.\n";
+    print "ERROR: The AFS client failed to start.\n";
+    print "ERROR: Please fix whatever problem kept it from running.\n";
     exit(1);
 }
 print "\n";
@@ -258,6 +265,9 @@ print "Then, run afs-rootvol.\n";
 # If we fail before all the instances are created, we need to back out of
 # everything we did as much as possible.
 END {
+    if ($shutdown_needed || @unwinds) {
+        print "\nCell setup failed, ABORTING\n";
+    }
     system("bos shutdown $server -localauth -wait") if $shutdown_needed;
     run(pop @unwinds) while @unwinds;
 }

diff --git a/debian/afs-rootvol b/debian/afs-rootvol
index 84e61c615d4ed08ae08f1d851bc0c854d86f2b75..ce239a7cebbfc8381c28ae1d092f3238ffb7b0de 100644 (file)
--- a/debian/afs-rootvol
+++ b/debian/afs-rootvol
@@ -178,5 +178,8 @@ unwind("vos remove $server $part root.afs.readonly -localauth");
 # If we fail before all the instances are created, we need to back out of
 # everything we did as much as possible.
 END {
+    if (@unwinds) {
+        print "\nRoot volume setup failed, ABORTING\n";
+    }
     run(pop @unwinds) while @unwinds;
 }