diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2017-07-21 00:48:46 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-07-22 06:55:16 +0700 |
| commit | 799fd7e23b2c5cd0a8946b4ea41686632d5cf971 (patch) | |
| tree | 31f2193770df6de8e9c72b290afd2f508c9a8cc0 | |
| parent | e93e6d8d12e89d11830af3f58e9579300a63440c (diff) | |
| download | slackbuilds-799fd7e23b2c5cd0a8946b4ea41686632d5cf971.tar.gz | |
network/firewalld: Use /etc/default/ rather than /etc/sysconfig/
It's cosmetic but more in line with what the rest of Slackware
might use...
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | network/firewalld/doinst.sh | 2 | ||||
| -rw-r--r-- | network/firewalld/firewalld.SlackBuild | 3 | ||||
| -rw-r--r-- | network/firewalld/rc.FireWallD | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/network/firewalld/doinst.sh b/network/firewalld/doinst.sh index 92f91a8538..9f4fb5fbe4 100644 --- a/network/firewalld/doinst.sh +++ b/network/firewalld/doinst.sh @@ -25,7 +25,7 @@ preserve_perms() { config etc/dbus-1/system.d/FirewallD.conf.new config etc/firewall/applet.conf.new config etc/firewalld/firewalld.conf.new -config etc/sysconfig/firewalld.new +config etc/default/firewalld.new preserve_perms etc/rc.d/rc.FireWallD.new if [ -x /usr/bin/update-desktop-database ]; then diff --git a/network/firewalld/firewalld.SlackBuild b/network/firewalld/firewalld.SlackBuild index d27dd716cf..c95b13dd34 100644 --- a/network/firewalld/firewalld.SlackBuild +++ b/network/firewalld/firewalld.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=firewalld VERSION=${VERSION:-0.4.4.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -89,6 +89,7 @@ mv $PKG/etc/dbus-1/system.d/FirewallD.conf $PKG/etc/dbus-1/system.d/FirewallD.co mv $PKG/etc/firewall/applet.conf $PKG/etc/firewall/applet.conf.new mv $PKG/etc/firewalld/firewalld.conf $PKG/etc/firewalld/firewalld.conf.new mv $PKG/etc/sysconfig/firewalld $PKG/etc/sysconfig/firewalld.new +mv $PKG/etc/sysconfig $PKG/etc/default mkdir -p $PKG/etc/rc.d cat $CWD/rc.FireWallD > $PKG/etc/rc.d/rc.FireWallD.new diff --git a/network/firewalld/rc.FireWallD b/network/firewalld/rc.FireWallD index 84d981f8ea..aa0d91b3dc 100644 --- a/network/firewalld/rc.FireWallD +++ b/network/firewalld/rc.FireWallD @@ -3,7 +3,7 @@ # Start firewalld: firewalld_start() { - [ -r /etc/sysconfig/firewalld ] && source /etc/sysconfig/firewalld + [ -r /etc/default/firewalld ] && source /etc/default/firewalld echo -n "Starting FireWallD daemon: /usr/sbin/firewalld " /usr/sbin/firewalld $FIREWALLD_ARGS echo |