Stop copy_base_dir_substitute_templates() chmod-ing existing directories.
authorMartin Schwenke <martin@meltin.net>
Mon, 14 Feb 2011 03:54:28 +0000 (14:54 +1100)
committerMartin Schwenke <martin@meltin.net>
Mon, 14 Feb 2011 03:54:28 +0000 (14:54 +1100)
This make break something out there but it is a sensible change.

Signed-off-by: Martin Schwenke <martin@meltin.net>
autocluster

index 1ff9c34d3807e15845483441205679bad81ac072..11cb1de554373afa4ca0b1d26e6ddc05acfd817c 100755 (executable)
@@ -641,6 +641,10 @@ copy_base_dir_substitute_templates ()
     for f in $(cd "$d" && find . \! -name '*~') ; do
        f="${f#./}" # remove leading "./" for clarity
        if [ -d "$d/$f" ]; then
+           # Don't chmod existing directory
+           if diskimage_is_directory "/$f" ; then
+               continue
+           fi
            diskimage_mkdir_p "/$f"
        else 
            diskimage_substitute_vars "$d/$f" "/$f"