canonical-hw-cert team mailing list archive

[Rod Smith <mp+431928@xxxxxxxxxxxxxxxxxx>]

Rod Smith has proposed merging ~rodsmith/maas-cert-server:trivial-maniacs-setup-tweak into maas-cert-server:master.

Commit message:
Fix for problem with DB_PASS variable not being set in setup_maas_admin() on re-run of the script

Requested reviews:
  hardware-certification-users (hardware-certification)

For more details, see:
https://code.launchpad.net/~rodsmith/maas-cert-server/+git/maas-cert-server/+merge/431928

I was working with Adrian on his review of https://code.launchpad.net/~rodsmith/maas-cert-server/+git/maas-cert-server/+merge/431157, and I intended to include this code in that merge, but Adrian accidentally hit the wrong "approve" button before I could do so. This change is pre-approved by him.
-- 
Your team hardware-certification-users is requested to review the proposed merge of ~rodsmith/maas-cert-server:trivial-maniacs-setup-tweak into maas-cert-server:master.

diff --git a/usr/sbin/maniacs-setup b/usr/sbin/maniacs-setup
index d507888..3104f45 100755
--- a/usr/sbin/maniacs-setup
+++ b/usr/sbin/maniacs-setup
@@ -386,6 +386,10 @@ setup_maas_admin() {
         RERUN=yes
         return
     fi
+    if [ -z $DB_PASS ] ; then
+        echo -n "* Please enter the PostgresQL password: "
+        read -sr DB_PASS
+    fi
 
     echo "* A MAAS administrative account with a name of $DEFAULT_USER is being"
     echo "* created."