[Fai-commit] r6530 - branches/stable/3.4/bin

[Michael Prokop]

Author: mika
Date: 2011-05-10 10:29:41 +0000 (Tue, 10 May 2011)
New Revision: 6530

Modified:
   branches/stable/3.4/bin/fai-cd
Log:
call genisoimage with -R instead of -r

Quote from a mail:
According to the genisoimage man page the "-r" does what normally would be
consider the sane thing and sets all directories to 555. This makes sense as
most people will want the cdfs to be readable by normal users. The problem is
that cfagent doesn't like it's /var/lib directories to be readable by others
and will not run.
The "-R" tells genisoimage to copy the perms as specified in the source
directory. With this option cfagent runs correctly and all is well.

Me: Another approach would be that the permissions for
/var/lib/cfengine2 are fixed during runtime.

(cherry picked from commit 4f2300b35819fa2fbd2de153fe984e271d317b7e)

From: lange <lange>

Modified: branches/stable/3.4/bin/fai-cd
===================================================================
--- branches/stable/3.4/bin/fai-cd	2011-05-10 10:00:27 UTC (rev 6529)
+++ branches/stable/3.4/bin/fai-cd	2011-05-10 10:29:41 UTC (rev 6530)
@@ -236,7 +236,7 @@
     [ $makeiso -eq 0 ] && return
 
     echo "Writing FAI CD-ROM image to $isoname. This may need some time."
-    genisoimage --iso-level 4 -V "$vname" -A "$aname" -log-file /dev/null -quiet -l -r -J -b "$boot_image" -no-emul-boot -boot-load-size 4 -boot-info-table -o $isoname $tmp || die 12 "genisoimage failed." 
+    genisoimage --iso-level 4 -V "$vname" -A "$aname" -log-file /dev/null -quiet -l -R -J -b "$boot_image" -no-emul-boot -boot-load-size 4 -boot-info-table -o $isoname $tmp || die 12 "genisoimage failed." 
     echo -n "ISO image size and filename: "; du -h $isoname
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - -