diff --git a/debian/changelog b/debian/changelog index ee11efd..cba5f4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qubes-core-agent (2.1.49) jessie; urgency=medium + + * fedora: Fix iptables config install script + + -- Marek Marczykowski-Górecki Thu, 15 Jan 2015 03:50:13 +0100 + qubes-core-agent (2.1.48) jessie; urgency=medium [ Jason Mehring ] diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 83a566e..5276059 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -221,6 +221,15 @@ for ip in '127\.0\.0\.1' '::1'; do fi done +# Copy ip(|6)tables into place if they do not already exist in filesystem. +# This prevents conflict with iptables-service +if [ ! -f '/etc/sysconfig/iptables' ]; then + cp -p /usr/lib/qubes/init/iptables /etc/sysconfig/iptables +fi +if [ ! -f '/etc/sysconfig/ip6tables' ]; then + cp -p /usr/lib/qubes/init/ip6tables /etc/sysconfig/ip6tables +fi + if [ "$1" != 1 ] ; then # do the rest of %post thing only when updating for the first time... exit 0 @@ -257,15 +266,6 @@ mkdir -p /rw #mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig #grep -v HWADDR /etc/sysconfig/network-scripts/ifcfg-eth0.orig > /etc/sysconfig/network-scripts/ifcfg-eth0 -# Copy ip(|6)tables into place if they do not already exist in filesystem. -# This prevents conflict with iptables-service -if [ ! -f '/etc/sysconfig/iptables' ]; then - cp -p /usr/lib/qubes/init/iptables /etc/sysconfig/iptables -fi -if [ ! -f '/etc/sysconfig/ip6tables' ]; then - cp -p /usr/lib/qubes/init/ip6tables /etc/sysconfig/ip6tables -fi - %triggerin -- notification-daemon # Enable autostart of notification-daemon when installed if [ ! -e /etc/xdg/autostart/notification-daemon.desktop ]; then diff --git a/version b/version index 7ec3b24..f1cd7fa 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.1.48 +2.1.49