blob: 6cdc80c7ad0abffebe61b0e82716e8b9599e5ae0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
34,35c34,35
< if [ -f ./share/arno-iptables-firewall/environment ]; then
< . ./share/arno-iptables-firewall/environment
---
> if [ -f /usr/share/arno-iptables-firewall/environment ]; then
> . /usr/share/arno-iptables-firewall/environment
37c37
< printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n" >&2
---
> printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n" >&2
219c219
<
---
>
221,223c221,223
< chmod 755 /etc/init.d/arno-iptables-firewall
< chown 0:0 "$FIREWALL_CONF" /etc/init.d/arno-iptables-firewall
< chmod 600 "$FIREWALL_CONF"
---
> chmod 755 /etc/rc.d/rc.arno-iptables-firewall
> chown 0:0 "$FIREWALL_CONF" /etc/rc.d/rc.arno-iptables-firewall
> chmod 600 "$FIREWALL_CONF"
228c228
< AIF_VERSION="$(grep "MY_VERSION=" ./bin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")"
---
> AIF_VERSION="$(grep "MY_VERSION=" /usr/sbin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")"
236,252d235
< # Remove any symlinks in rc*.d out of the way
< rm -f /etc/rc*.d/*arno-iptables-firewall
<
< if get_user_yn "Do you want to start the firewall at boot (via /etc/init.d/) (Y/N)?" "y"; then
< if [ -d /etc/rcS.d ]; then
< ln -sv /etc/init.d/arno-iptables-firewall /etc/rcS.d/S41arno-iptables-firewall
< else
< ln -sv /etc/init.d/arno-iptables-firewall /etc/rc2.d/S11arno-iptables-firewall
< fi
<
< # Check for insserv. Used for dependency based booting on eg. Debian
< INSSERV="$(find_command /sbin/insserv)"
< if [ -n "$INSSERV" ]; then
< "$INSSERV" arno-iptables-firewall
< fi
< fi
<
254c237
< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1"
---
> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1"
256c239
< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0"
---
> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0"
259c242
< if diff ./etc/arno-iptables-firewall/firewall.conf "$FIREWALL_CONF" >/dev/null; then
---
> if diff /usr/share/arno-iptables-firewall/firewall.conf.orig "$FIREWALL_CONF" >/dev/null; then
275a259,276
> echo ""
> echo "-------------------------------------------------------------------------------"
> echo "** NOTE: 1) You can now (manually) start the firewall by executing **"
> echo "** \"/etc/rc.d/rc.arno-iptables-firewall start\" **"
> echo "** It is recommended however to first review the settings in **"
> echo "** /etc/arno-iptables-firewall/firewall.conf! **"
> echo "** **"
> echo "** 2) In order to start the firewall automatically at boot-time, **"
> echo "** you will need to manually create in /etc/rc.d/ an appropriate **"
> echo "** symlink, named \"rc.firewall\", pointing to the startup script. **"
> echo "** To do that, issue the following command: **"
> echo "** **"
> echo "** ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall **"
> echo "** **"
> echo "** Simply delete the link if you wish to disable firewall startup **"
> echo "** at boot-time. **"
> echo "-------------------------------------------------------------------------------"
> echo ""
278d278
<
|
