[Fai-commit] r6012 - in branches/stable/3.4: debian doc

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:56:23 +0000 (Tue, 17 Aug 2010)
New Revision: 6012

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/doc/fai-guide.txt
Log:
fai-guide.txt: add info how to generate the encrypted password


Conflicts:

	debian/changelog

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

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:56:21 UTC (rev 6011)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:56:23 UTC (rev 6012)
@@ -1,8 +1,11 @@
 fai (3.4~beta6) unstable; urgency=low
 
   [ Thomas Lange ]
+  * get-config-dir-http: new script to get a tarball of the config space
+    (thanks to Waldemar Brodkorb for the initial patch)
   * dhcp-edit: new command that adds or removes entries to/from dhcpd.conf
     add $modified, add more messages, fix code for adding a host
+  * faimond-gui: add option -s
   * make-fai-nfsroot.conf: set NFSROOT_HOOKS by default
   * make-fai-nfsroot: fix typo, remove redundant rm command
   * mkramdisk: use exit in main routine (closes: #583289)
@@ -67,6 +70,8 @@
   * subroutines: adjust to new option of mkramdisks
   * subroutines: new subroutine umount_csspace, so it can be used in user
     hooks (thanks to Waldemar for the patch)
+  * Makefile: add support for small pixmaps in faimond-gui
+  * fai-guide.txt: add info how to generate the encrypted password
   
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks

Modified: branches/stable/3.4/doc/fai-guide.txt
===================================================================
--- branches/stable/3.4/doc/fai-guide.txt	2010-08-17 12:56:21 UTC (rev 6011)
+++ branches/stable/3.4/doc/fai-guide.txt	2010-08-17 12:56:23 UTC (rev 6012)
@@ -1635,7 +1635,9 @@
 
 ROOTPW::
 The encrypted root password for the new system. You can use `crypt(3)`
-or md5 encryption for the password.
+or md5 encryption for the password. You can create the encrypted
+password using `mkpasswd(1)`. See <<hints,chapter various hints>> for
+more info.
 
 UTC::
 Set hardware clock to UTC if _$UTC=yes_. Otherwise set clock to local