[Fai-commit] r5846 - in trunk: bin debian examples/simple/scripts/DEMO examples/simple/scripts/FAIBASE

[Thomas Lange]

Author: lange
Date: 2010-07-08 09:38:49 +0000 (Thu, 08 Jul 2010)
New Revision: 5846

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
   trunk/examples/simple/scripts/DEMO/10-misc
   trunk/examples/simple/scripts/FAIBASE/10-misc
Log:
put ROOTPW into quotes, so empty password will work (thanks to Adrien
Cunin for the patch)

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-07 16:01:46 UTC (rev 5845)
+++ trunk/bin/make-fai-nfsroot	2010-07-08 09:38:49 UTC (rev 5846)
@@ -224,7 +224,7 @@
 
     # copy to nfsroot
 #    echo "root:$FAI_ROOTPW" | $ROOTCMD chpasswd --encrypted
-    $ROOTCMD usermod -p $FAI_ROOTPW root
+    $ROOTCMD usermod -p "$FAI_ROOTPW" root
     cp -RLpv $cfdir/* $NFSROOT/etc/fai
     # append additional variables to fai.conf for the install clients
     [ -z "$FAI_CONFIG_SRC" ] && echo "FAI_CONFIG_SRC=nfs://`hostname`$FAI_CONFIGDIR" >> $NFSROOT/etc/fai/fai.conf

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-07 16:01:46 UTC (rev 5845)
+++ trunk/debian/changelog	2010-07-08 09:38:49 UTC (rev 5846)
@@ -26,6 +26,8 @@
   * subroutines: do not dump bash array variables
   * subroutines: add commentary how to create variables.log for sourcing
     them later again (thanks to Andreas Schuldei)
+  * put ROOTPW into quotes, so empty password will work (thanks to Adrien
+    Cunin for the patch)
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: trunk/examples/simple/scripts/DEMO/10-misc
===================================================================
--- trunk/examples/simple/scripts/DEMO/10-misc	2010-07-07 16:01:46 UTC (rev 5845)
+++ trunk/examples/simple/scripts/DEMO/10-misc	2010-07-08 09:38:49 UTC (rev 5846)
@@ -13,5 +13,5 @@
 if ! $ROOTCMD getent passwd demo ; then
     $ROOTCMD adduser --disabled-login --gecos "fai demo user" demo
 #    echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
-    $ROOTCMD usermod -p $ROOTPW demo
+    $ROOTCMD usermod -p "$ROOTPW" demo
 fi

Modified: trunk/examples/simple/scripts/FAIBASE/10-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/10-misc	2010-07-07 16:01:46 UTC (rev 5845)
+++ trunk/examples/simple/scripts/FAIBASE/10-misc	2010-07-08 09:38:49 UTC (rev 5846)
@@ -18,7 +18,7 @@
 
 # set root password
 #echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
-$ROOTCMD usermod -p $ROOTPW root
+$ROOTCMD usermod -p "$ROOTPW" root
 # make /root accessible only by root
 chmod 0700 $target/root
 chown root:root $target/root