[Fai-commit] r5616 - in trunk: bin debian man

[Thomas Lange]

Author: lange
Date: 2009-10-28 12:46:45 +0000 (Wed, 28 Oct 2009)
New Revision: 5616

Modified:
   trunk/bin/fai-cd
   trunk/debian/changelog
   trunk/man/fai-cd.8
Log:
* fai-cd, fai: get FAI_CONFIGDIR from new config file, add option -H
* fai-cd.8: add option -H

Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2009-10-28 11:10:09 UTC (rev 5615)
+++ trunk/bin/fai-cd	2009-10-28 12:46:45 UTC (rev 5616)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 4.0.1, 19-july-2009"
+version="fai-cd 4.1, 28-october-2009"
 
 forceremoval=0;
 burn=0
@@ -147,8 +147,8 @@
     [ -d $usbdir ] || die 17 "$usbdir does not exist."
     if [ $rsync -eq 1 ]; then
 	echo "Syncing FAI data to USB device $usbdir"
-	rsync --delete -av $tmp/boot $usbdir || true
-	[ -d $tmp/live ] && rsync --delete -av $tmp/live $usbdir || true
+	rsync --delete -avW $tmp/boot $usbdir || true
+	[ -d $tmp/live ] && rsync --delete -avW $tmp/live $usbdir || true
     else
 	echo "Writing FAI data to USB device $usbdir"
 	cp -a $tmp/boot $usbdir 2>/dev/null || true
@@ -233,11 +233,12 @@
 [ -x $(which rsync) ] && rsync=1
 
 # Parse commandline options
-while getopts "nkfhg:bBm:C:u:" opt ; do
+while getopts "nkfhHg:bBm:C:u:" opt ; do
     case "$opt" in
         C)  cdir=$OPTARG ;;
 	f)  forceremoval=1 ;;
 	h)  usage ;;
+	H)  hidedirs="" ;;
 	g)  grub_config="$OPTARG" ;;
 	k)  keep=1 ;;
 	m)  mirrordir="$OPTARG" ;;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-28 11:10:09 UTC (rev 5615)
+++ trunk/debian/changelog	2009-10-28 12:46:45 UTC (rev 5616)
@@ -47,7 +47,8 @@
   * fai.conf, make-fai-nfsroot.conf: move FAI_CONFIGDIR to m-f-n.conf,
     because it's only needed on an install server
     add comment, rearrange variables, important variables first
-  * fai-cd, fai: get FAI_CONFIGDIR from new config file
+  * fai-cd, fai: get FAI_CONFIGDIR from new config file, add option -H
+  * fai-cd.8: add option -H
   * fai-server.preinst, fai-server.prerm, fai-quickstart.postinst: print
     warning if FAI_CONFIGDIR is still in the wrong place
   * fai-quickstart.prerm: source make-fai-nfsroot.conf instead of fai.conf

Modified: trunk/man/fai-cd.8
===================================================================
--- trunk/man/fai-cd.8	2009-10-28 11:10:09 UTC (rev 5615)
+++ trunk/man/fai-cd.8	2009-10-28 12:46:45 UTC (rev 5616)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH fai-cd 8 "3 may 2009" "FAI 3.2.20"
+.TH fai-cd 8 "28 october 2009" "FAI 3.3"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -79,6 +79,11 @@
 .BI \-h
 Show simple help and version.
 .TP
+.BI \-H
+Do not hide directories. Using this option will consume 220MB more
+disk space on your media. By default, some directories like man pages
+and locales are hidden and will not be put onto the CD or the USB stick.
+.TP
 .BI \-k
 Keep the temporary filesystem for debugging. The script will sleep for
 a long time, before continuing the cleanup of temp files and