pf-tools/pf-tools: 4 new changesets

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/1805b6332cf9
changeset: 1283:1805b6332cf9
user:      shad
date:      Tue Jul 29 16:50:32 2014 +0200
description:
no double translating

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/7d75263130c7
changeset: 1284:7d75263130c7
user:      shad
date:      Tue Jul 29 16:51:52 2014 +0200
description:
preseed is in a subdirectory (dirty but involve apacheconf + pftools conf + pftools code)

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/5e14c0f14680
changeset: 1285:5e14c0f14680
user:      shad
date:      Tue Jul 29 16:53:01 2014 +0200
description:
create .stor file during the install

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/faab156cf62e
changeset: 1286:faab156cf62e
user:      shad
date:      Tue Jul 29 18:04:12 2014 +0200
description:
sgid on preseed directory doesn't seems to work properly

diffstat:

 Makefile                   |   4 ++++
 lib/PFTools/Utils.pm       |  12 +++++++++---
 tools/Translate_old_config |   1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 695096e19db9 -r faab156cf62e Makefile
--- a/Makefile	Mon Jul 28 17:47:53 2014 +0200
+++ b/Makefile	Tue Jul 29 18:04:12 2014 +0200
@@ -6,6 +6,7 @@
 FILTERS_DIR=$(DESTDIR)/usr/sbin
 CONF_DIR=$(DESTDIR)/etc
 TPL_DIR=$(DESTDIR)/usr/share/pf-tools/templates
+CACHE_DIR=$(DESTDIR)/var/lib/pf-tools
 
 SBIN=sbin/*
 FILTERS=filters/*
@@ -65,6 +66,9 @@
 	# PFTools Config file
 	mkdir -p $(CONF_DIR)
 	install -o root -g root -m 0600 $(CONF) $(CONF_DIR)/pf-tools.conf.new
+	
+	# PFTools cache directory
+	mkdir -p $(CACHE_DIR)
 
 install_host: $(TOOLS)
 	# PFHost tools
diff -r 695096e19db9 -r faab156cf62e lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Mon Jul 28 17:47:53 2014 +0200
+++ b/lib/PFTools/Utils.pm	Tue Jul 29 18:04:12 2014 +0200
@@ -213,6 +213,9 @@
         }
     );
 
+    # sgid doesn't seems to work properly
+    chmod 0644, $filename;
+
     return $basename;
 }
 
@@ -1286,9 +1289,12 @@
         'arch'         => $host_ref->{'deployment'}->{'arch'},
         'distrib'      => $host_ref->{'deployment'}->{'distrib'},
         'serial_speed' => '115200',
-        'preseed_url'  => $preseed_filename,
-        'preseed_md5'  => $preseed_md5,
-        'console'      => $host_ref->{'boot'}->{'console'},
+
+        # FIXME the path to preseed files in pftools.conf
+        # is to be matched with the path of apache conf
+        'preseed_url'     => qq{preseed/$preseed_filename},
+        'preseed_md5'     => $preseed_md5,
+        'console'         => $host_ref->{'boot'}->{'console'},
         'install_cmdline' => $host_ref->{'boot'}->{'cmdline'},
         'cmdline'         => $cmdline,
         'kernel'          => $host_ref->{'boot'}->{'kernel'},
diff -r 695096e19db9 -r faab156cf62e tools/Translate_old_config
--- a/tools/Translate_old_config	Mon Jul 28 17:47:53 2014 +0200
+++ b/tools/Translate_old_config	Tue Jul 29 18:04:12 2014 +0200
@@ -143,7 +143,6 @@
         if ($2) {
             my ( $subsec, $subval ) = ( $1, $2 );
             $subsec =~ s/ether/mac/;
-            $subsec =~ s/preseedtpl/preseed/;
             $comments->{'inline'}->{$current_section}->{$subsec} = $subval;
         }
     }