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

[Thomas Lange]

Author: lange
Date: 2009-07-24 15:28:46 +0000 (Fri, 24 Jul 2009)
New Revision: 5485

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
   trunk/examples/simple/scripts/DEMO/10-misc
   trunk/examples/simple/scripts/FAIBASE/10-misc
Log:
make-fai-nfsroot, DEMO/10-misc,FAIBASE/10-misc: chpasswd does not
support -e in newer version, replaced by usermod

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-07-24 09:13:15 UTC (rev 5484)
+++ trunk/bin/make-fai-nfsroot	2009-07-24 15:28:46 UTC (rev 5485)
@@ -222,7 +222,8 @@
 copy_fai_files() {
 
     # copy to nfsroot
-    echo "root:$FAI_ROOTPW" | $ROOTCMD chpasswd --encrypted
+#    echo "root:$FAI_ROOTPW" | $ROOTCMD chpasswd --encrypted
+    $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	2009-07-24 09:13:15 UTC (rev 5484)
+++ trunk/debian/changelog	2009-07-24 15:28:46 UTC (rev 5485)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta7) unstable; urgency=low
+fai (3.2.23~beta10) unstable; urgency=low
 
   [ Thomas Lange ]
   * subroutines-linux: fix log message
@@ -52,6 +52,8 @@
   * install_packages: do not call AptPkg function when -N was given
   * 10-base-classes: replace --print-installation-architecture by
     --print-architecture
+  * make-fai-nfsroot, DEMO/10-misc,FAIBASE/10-misc: chpasswd does not
+    support -e in newer version, replaced by usermod
   
   [ Michael Tautschnig ]
   * setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if

Modified: trunk/examples/simple/scripts/DEMO/10-misc
===================================================================
--- trunk/examples/simple/scripts/DEMO/10-misc	2009-07-24 09:13:15 UTC (rev 5484)
+++ trunk/examples/simple/scripts/DEMO/10-misc	2009-07-24 15:28:46 UTC (rev 5485)
@@ -12,5 +12,6 @@
 # add a demo user account
 if ! $ROOTCMD getent passwd demo ; then
     $ROOTCMD adduser --disabled-login --gecos "fai demo user" demo
-    echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+#    echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+    $ROOTCMD usermod -p $ROOTPW demo
 fi

Modified: trunk/examples/simple/scripts/FAIBASE/10-misc
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/10-misc	2009-07-24 09:13:15 UTC (rev 5484)
+++ trunk/examples/simple/scripts/FAIBASE/10-misc	2009-07-24 15:28:46 UTC (rev 5485)
@@ -17,7 +17,8 @@
 fcopy -iM /etc/hosts /etc/motd
 
 # set root password
-echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+#echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
+$ROOTCMD usermod -p $ROOTPW root
 # make /root accessible only by root
 chmod 0700 $target/root
 chown root:root $target/root