Attachment 928274 Details for Bug 1131444 – Patch implementing the "service ipset save" command.

[patch] Patch implementing the "service ipset save" command.

ipset-save.patch (text/plain), 2.41 KB, created by Patrick Monnerat on 2014-08-19 10:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Monnerat

Created: 2014-08-19 10:18:31 UTC

Size: 2.41 KB

patch

obsolete

>diff -Naurp ipset/master.orig/ipset.save ipset/master/ipset.save
>--- ipset/master.orig/ipset.save	1970-01-01 01:00:00.000000000 +0100
>+++ ipset/master/ipset.save	2014-08-15 19:02:09.533095942 +0200
>@@ -0,0 +1,2 @@
>+#!/bin/bash
>+exec /usr/libexec/ipset/ipset.start-stop save
>diff -Naurp ipset/master.orig/ipset.spec ipset/master/ipset.spec
>--- ipset/master.orig/ipset.spec	2014-08-19 11:57:15.846955638 +0200
>+++ ipset/master/ipset.spec	2014-08-19 12:01:24.109147177 +0200
>@@ -8,6 +8,7 @@ URL:              http://ipset.netfilter
> Source0:          http://ipset.netfilter.org/%{name}-%{version}.tar.bz2
> Source1:          %{name}.service
> Source2:          %{name}.start-stop
>+Source3:          %{name}.save
> 
> BuildRequires:    libmnl-devel
> 
>@@ -15,6 +16,9 @@ BuildRequires:    libmnl-devel
> # explicitly update only one of the two (e.g 'yum update ipset')
> Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
> 
>+# For additional service requests.
>+Requires:         initscripts
>+
> %description
> IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which can be
> administered by the ipset utility. Depending on the type, currently an IP set
>@@ -97,6 +101,11 @@ install -c -m 755 %{SOURCE2} %{buildroot
> # Create directory for configuration
> mkdir -p %{buildroot}%{_sysconfdir}/%{name}
> 
>+# Install additional service requests.
>+install -d -m 755 %{buildroot}%{_libexecdir}/initscripts/legacy-actions/%{name}/
>+install -c -m 755 %{SOURCE3} \
>+    %{buildroot}%{_libexecdir}/initscripts/legacy-actions/%{name}/save
>+
> 
> %preun
> if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
>@@ -142,6 +151,7 @@ fi
> %{_unitdir}/%{name}.service
> %dir %{_libexecdir}/%{name}
> %attr(0755,root,root) %{_libexecdir}/%{name}/%{name}.start-stop
>+%attr(0755,root,root) %{_libexecdir}/initscripts/legacy-actions/%{name}/
> %dir %{_sysconfdir}/%{name}
> 
> 
>diff -Naurp ipset/master.orig/ipset.start-stop ipset/master/ipset.start-stop
>--- ipset/master.orig/ipset.start-stop	2014-08-19 11:57:15.846955638 +0200
>+++ ipset/master/ipset.start-stop	2014-08-19 12:03:16.860142486 +0200
>@@ -193,6 +193,10 @@ case "$1" in
> 	RETVAL=$?
> 	[[ $RETVAL -eq 6 ]] && echo "${IPSET}: not running" && exit 0
> 	;;
>+    save)
>+	save
>+	RETVAL=$?
>+	;;
>     reload)
> 	[[ $IPSET_SAVE_ON_RESTART = yes ]] && save
> 	stop
>@@ -202,7 +206,7 @@ case "$1" in
> 	RETVAL=$?
> 	;;
>     *)
>-	echo "Usage: $IPSET {start|stop|reload}" >&2
>+	echo "Usage: $IPSET {start|stop|save|reload}" >&2
> 	exit 1
> esac
>

Actions: View | Diff

Attachments on bug 1131444: 928274