summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2014-01-04 23:03:25 +0100
committerThomas Backlund <tmb@mageia.org>2014-01-04 23:03:25 +0100
commitb5a51ec5cb97b7a702e30a36adf174e681277061 (patch)
tree3126f5aba9919300c1f5ed575ddb6458634d1455
parent00c9096fdf5b108601be559691b17dd79d3a9022 (diff)
downloaddraklive-config-b5a51ec5cb97b7a702e30a36adf174e681277061.tar
draklive-config-b5a51ec5cb97b7a702e30a36adf174e681277061.tar.gz
draklive-config-b5a51ec5cb97b7a702e30a36adf174e681277061.tar.bz2
draklive-config-b5a51ec5cb97b7a702e30a36adf174e681277061.tar.xz
draklive-config-b5a51ec5cb97b7a702e30a36adf174e681277061.zip
shorewall fix is not needed anymore
-rw-r--r--config/live.cfg4
-rw-r--r--files/shorewall-interfaces13
-rw-r--r--files/shorewall6-interfaces13
3 files changed, 0 insertions, 30 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 7788fc5..af07ece 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -51,10 +51,6 @@ my $_l = {
# lock bluedevil, radeon-firmware, kernel-firnware-nonfree
[ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ],
- # shorewall fixes
- #[ 'files/shorewall-interfaces', '/etc/shorewall/interfaces', { mode => 0644 } ],
- #[ 'files/shorewall6-interfaces', '/etc/shorewall6/interfaces', { mode => 0644 } ],
-
# add local repos
if_($live->{settings}{arch} eq 'i586',
[ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ],
diff --git a/files/shorewall-interfaces b/files/shorewall-interfaces
deleted file mode 100644
index 84b0899..0000000
--- a/files/shorewall-interfaces
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Shorewall version 4 - Interfaces File
-#
-# For information about entries in this file, type "man shorewall-interfaces"
-#
-# The manpage is also online at
-# http://www.shorewall.net/manpages/shorewall-interfaces.html
-#
-###############################################################################
-FORMAT 2
-###############################################################################
-#ZONE INTERFACE OPTIONS
-net + detect
diff --git a/files/shorewall6-interfaces b/files/shorewall6-interfaces
deleted file mode 100644
index c14d03a..0000000
--- a/files/shorewall6-interfaces
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Shorewall6 version 4 - Interfaces File
-#
-# For information about entries in this file, type "man shorewall6-interfaces"
-#
-# The manpage is also online at
-# http://www.shorewall.net/manpages6/shorewall6-interfaces.html
-#
-###############################################################################
-FORMAT 2
-###############################################################################
-#ZONE INTERFACE OPTIONS
-net + detect