[Fai-commit] r5994 - in branches/stable/3.4: bin debian examples/simple/scripts/DEMO examples/simple/scripts/FAIBASE

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:54:58 +0000 (Tue, 17 Aug 2010)
New Revision: 5994

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


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:54:49 UTC (rev 5993)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:54:58 UTC (rev 5994)
@@ -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: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:54:49 UTC (rev 5993)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:54:58 UTC (rev 5994)
@@ -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: branches/stable/3.4/examples/simple/scripts/DEMO/10-misc
===================================================================
--- branches/stable/3.4/examples/simple/scripts/DEMO/10-misc	2010-08-17 12:54:49 UTC (rev 5993)
+++ branches/stable/3.4/examples/simple/scripts/DEMO/10-misc	2010-08-17 12:54:58 UTC (rev 5994)
@@ -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: branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc
===================================================================
--- branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc	2010-08-17 12:54:49 UTC (rev 5993)
+++ branches/stable/3.4/examples/simple/scripts/FAIBASE/10-misc	2010-08-17 12:54:58 UTC (rev 5994)
@@ -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