Contents of /trunk/firewalld/patches/firewalld-0.2.2-confd.patch
Parent Directory | Revision Log
Revision 1696 -
(show annotations)
(download)
Mon Mar 12 23:41:32 2012 UTC (12 years, 6 months ago) by niro
File size: 3742 byte(s)
Mon Mar 12 23:41:32 2012 UTC (12 years, 6 months ago) by niro
File size: 3742 byte(s)
-re-diffed patch
1 | diff -Naur firewalld-0.2.2/config/firewalld.init firewalld-0.2.2-magellan/config/firewalld.init |
2 | --- firewalld-0.2.2/config/firewalld.init 2012-03-06 13:52:52.000000000 +0100 |
3 | +++ firewalld-0.2.2-magellan/config/firewalld.init 2012-03-13 01:31:42.411982933 +0100 |
4 | @@ -29,7 +29,7 @@ |
5 | prog="firewalld" |
6 | #config="/etc/firewalld/firewalld.conf" |
7 | |
8 | -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog |
9 | +[ -e /etc/conf.d/$prog ] && . /etc/conf.d/$prog |
10 | |
11 | lockfile=/var/lock/subsys/$prog |
12 | |
13 | diff -Naur firewalld-0.2.2/config/firewalld.service firewalld-0.2.2-magellan/config/firewalld.service |
14 | --- firewalld-0.2.2/config/firewalld.service 2012-03-06 13:52:52.000000000 +0100 |
15 | +++ firewalld-0.2.2-magellan/config/firewalld.service 2012-03-13 01:32:09.069982933 +0100 |
16 | @@ -5,7 +5,7 @@ |
17 | Conflicts=iptables.service ip6tables.service ebtables.service |
18 | |
19 | [Service] |
20 | -EnvironmentFile=-/etc/sysconfig/firewalld |
21 | +EnvironmentFile=-/etc/conf.d/firewalld |
22 | ExecStart=/usr/sbin/firewalld --nofork |
23 | ExecReload=/usr/bin/firewall-cmd --reload |
24 | |
25 | diff -Naur firewalld-0.2.2/config/Makefile.am firewalld-0.2.2-magellan/config/Makefile.am |
26 | --- firewalld-0.2.2/config/Makefile.am 2012-03-06 13:52:52.000000000 +0100 |
27 | +++ firewalld-0.2.2-magellan/config/Makefile.am 2012-03-13 01:33:00.024982932 +0100 |
28 | @@ -54,11 +54,11 @@ |
29 | endif |
30 | |
31 | install-sysconfig: |
32 | - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig |
33 | - $(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
34 | + mkdir -p $(DESTDIR)$(sysconfdir)/conf.d |
35 | + $(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
36 | |
37 | uninstall-sysconfig: |
38 | - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
39 | + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
40 | |
41 | install-init: firewalld.init firewalld.sysconfig |
42 | mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d |
43 | @@ -66,7 +66,7 @@ |
44 | |
45 | uninstall-init: |
46 | rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/firewalld |
47 | - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
48 | + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
49 | |
50 | install-service: |
51 | mkdir -p $(DESTDIR)$(SYSTEMD_UNITDIR) |
52 | diff -Naur firewalld-0.2.2/config/Makefile.in firewalld-0.2.2-magellan/config/Makefile.in |
53 | --- firewalld-0.2.2/config/Makefile.in 2012-03-06 13:52:52.000000000 +0100 |
54 | +++ firewalld-0.2.2-magellan/config/Makefile.in 2012-03-13 01:33:40.706982932 +0100 |
55 | @@ -516,11 +516,11 @@ |
56 | all: $(dist_desktop_DATA) $(dist_polkit1_action_DATA) |
57 | |
58 | install-sysconfig: |
59 | - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig |
60 | - $(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
61 | + mkdir -p $(DESTDIR)$(sysconfdir)/conf.d |
62 | + $(INSTALL) firewalld.sysconfig $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
63 | |
64 | uninstall-sysconfig: |
65 | - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
66 | + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
67 | |
68 | install-init: firewalld.init firewalld.sysconfig |
69 | mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d |
70 | @@ -528,7 +528,7 @@ |
71 | |
72 | uninstall-init: |
73 | rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/firewalld |
74 | - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/firewalld |
75 | + rm -f $(DESTDIR)$(sysconfdir)/conf.d/firewalld |
76 | |
77 | install-service: |
78 | mkdir -p $(DESTDIR)$(SYSTEMD_UNITDIR) |
79 | diff -Naur firewalld-0.2.2/firewalld.spec firewalld-0.2.2-magellan/firewalld.spec |
80 | --- firewalld-0.2.2/firewalld.spec 2012-03-06 13:52:52.000000000 +0100 |
81 | +++ firewalld-0.2.2-magellan/firewalld.spec 2012-03-13 01:34:04.748982932 +0100 |
82 | @@ -148,7 +148,7 @@ |
83 | %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services |
84 | %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones |
85 | %defattr(0644,root,root) |
86 | -%config(noreplace) %{_sysconfdir}/sysconfig/firewalld |
87 | +%config(noreplace) %{_sysconfdir}/conf.d/firewalld |
88 | #%attr(0755,root,root) %{_initrddir}/firewalld |
89 | %{_unitdir}/firewalld.service |
90 | %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf |