Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:Factory checked in at Thu Dec 2 16:27:07 CET 2010. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2010-11-16 16:03:20.000000000 +0100 +++ SuSEfirewall2/SuSEfirewall2.changes 2010-12-02 14:35:58.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 2 13:33:59 UTC 2010 - lnussel@suse.de + +- don't unload rules when using systemd + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- SuSEfirewall2-3.6.253.tar.bz2 New: ---- SuSEfirewall2-3.6.254.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.GUVk9E/_old 2010-12-02 16:26:34.000000000 +0100 +++ /var/tmp/diff_new_pack.GUVk9E/_new 2010-12-02 16:26:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package SuSEfirewall2 (Version 3.6.253) +# spec file for package SuSEfirewall2 (Version 3.6.254) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: SuSEfirewall2 -Version: 3.6.253 +Version: 3.6.254 Release: 1 License: GPLv2+ Group: Productivity/Networking/Security ++++++ SuSEfirewall2-3.6.253.tar.bz2 -> SuSEfirewall2-3.6.254.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.253/SuSEfirewall2_init new/SuSEfirewall2-3.6.254/SuSEfirewall2_init --- old/SuSEfirewall2-3.6.253/SuSEfirewall2_init 2010-11-16 16:00:24.000000000 +0100 +++ new/SuSEfirewall2-3.6.254/SuSEfirewall2_init 2010-12-02 14:32:47.000000000 +0100 @@ -36,9 +36,8 @@ case "$1" in start) - echo -n "Starting Firewall Initialization " + echo -n "Loading basic firewall rules " if test -x /usr/sbin/iptables; then - echo -n '(phase 1 of 2) ' /bin/rm -rf /var/run/SuSEfirewall2 $SUSEFWALL --bootlock -q $startmode else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SuSEfirewall2-3.6.253/SuSEfirewall2_setup new/SuSEfirewall2-3.6.254/SuSEfirewall2_setup --- old/SuSEfirewall2-3.6.253/SuSEfirewall2_setup 2010-11-16 16:00:24.000000000 +0100 +++ new/SuSEfirewall2-3.6.254/SuSEfirewall2_setup 2010-12-02 14:32:47.000000000 +0100 @@ -31,17 +31,24 @@ case "$1" in start) - echo -n "Starting Firewall Initialization " - echo -n '(phase 2 of 2) ' + echo -n "Loading firewall rules " $SUSEFWALL -q --bootunlock start rc_status -v ;; stop) - echo -n "Shutting down the Firewall " - if [ -z "$REDIRECT" ]; then + if [ -e /sys/fs/cgroup/systemd ]; then + # when using systemd we don't know whether we are + # called due to shutdown of the machine. So we can't + # unload rules here. Call /sbin/SuSEfirewall2 + # directly instead to unload rules. + echo -n "Not unloading firewall rules when using systemd " + rc_status -s + elif [ -z "$REDIRECT" ]; then + echo -n "Unloading firewall rules" $SUSEFWALL -q stop rc_status -v else + echo -n "Not unloading firewall rules at system shutdown" rc_status -s fi ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org