nearly live

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 7b732160a499458b374f0fd16b58835d0d72aba1..8772dfdc0d6b0cdc66e6d228b4f4d374b6182584 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -903,7 +903,7 @@ echo ongoing skip count is now $skip_count
 
 #put the file back into place.
 echo file we created looks like this:
-filedump "$new_version"
+cat "$new_version"
 
     \mv "$new_version" "$filename"
     test_or_die "moving the new version into place in: $filename"

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index d3dfbad1d5a793b9ff2f050aaa95d26ef337a0c5..af0cf3db545ed0038385aa5497fc71c3d8c6d6a1 100644 (file)
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -125,8 +125,7 @@ function remove_subdomain()
     return 0
   fi
 
-  create_chomped_copy_of_file "$domain_file" \
-      "${subdomain}.*${containing_domain} *IN *A *${IP_ADDRESS}" 1
+  create_chomped_copy_of_file "$domain_file" "${old_domain}" 2
 }
 
 # adds a new subdomain under a containing domain.
@@ -153,9 +152,9 @@ function add_new_subdomain()
   if grep -q "$new_domain" "$domain_file"; then
     echo "The subdomain $subdomain already seems to exist in the domain"
     echo "configuration file: $domain_file"
-    echo "Please edit the config file to remove the subdomain before trying"
-    echo "to re-add the subdomain."
-    exit 1
+    echo "We are considering our work done; if you want to modify the subdomain,"
+    echo "then please call remove_domain on it first."
+    return 0
   fi
 
   # append the new subdomain into the config file.