Roland Mas, 2012-06-18 17:02:01 +0200 :

[...]

> The following patch fixes this problem.

Actually, it only fixed the use case where fwb_compile_all was invoked
with -a (to build all scripts at once), and kept the invocation to build
one script broken.  This updated patch should fix both cases.

--- fwb_compile_all.orig	2012-06-18 17:17:05.480629853 +0200
+++ /usr/bin/fwb_compile_all	2012-06-18 17:22:31.501436788 +0200
@@ -43,7 +43,7 @@
 
 shift `expr $OPTIND - 1`
 
-test -n "$all" && LIST=`fwblookup -f $XMLFILE -lN /${LIB}/Firewalls | grep -v Firewalls` || {
+test -n "$all" && LIST=`fwbedit list -f $XMLFILE -c -o /${LIB}/Firewalls -F %name%` || {
     while test -n "$1"; do
         LIST="$LIST $1"
         shift
@@ -51,7 +51,8 @@
 }
 
 for f in `echo $LIST`; do
-    platform=`fwblookup -f $XMLFILE -a platform /${LIB}/Firewalls/$f`
+    platform=`fwbedit list -f $XMLFILE -F %platform% -o /${LIB}/Firewalls/$f`
+    id=`fwbedit list -f $XMLFILE -F %id% -o /${LIB}/Firewalls/$f`
     case "$platform" in
         iptables) comp="fwb_ipt" ;;
         ipf)      comp="fwb_ipf" ;;
@@ -62,6 +63,6 @@
     esac
     echo
     echo "################ $f"
-    $comp $V -f $XMLFILE -d $DIR $f;
+    $comp $V -f $XMLFILE -d $DIR -i $id;
   done
 
Roland.
-- 
Roland Mas

'And what would humans be without love?'
RARE, said Death.  -- in Sourcery (Terry Pratchett)

Reply via email to