Package: ipsec-tools
Version: 1:0.8.0-3
Ubuntu patches setkey.init and racoon.init to use the lsb functions, as
below. Could these patches be applied in the debian package?
thanks,
-serge
diff -Nru ipsec-tools-0.8.0/debian/ipsec-tools.setkey.init
ipsec-tools-0.8.0/debian/ipsec-tools.setkey.init
--- ipsec-tools-0.8.0/debian/ipsec-tools.setkey.init 2011-03-25
06:32:19.000000000 -0500
+++ ipsec-tools-0.8.0/debian/ipsec-tools.setkey.init 2011-06-08
12:23:25.000000000 -0500
@@ -28,23 +28,27 @@
set -e
+. /lib/lsb/init-functions
+
case "$1" in
start)
- echo "Loading IPsec SA/SP database: "
-
+ log_begin_msg "Loading IPsec SA/SP database: "
+ err=0
for file in $SETKEY_CONF $SETKEY_CONF_DIR/*.conf ; do
if [ -r "$file" ] ; then
- echo " - ${file}"
- $SETKEY -f $file
+ log_progress_msg " - ${file}"
+ $SETKEY -f $file || err=1
fi
done
- echo "done."
+ log_end_msg $err
;;
stop)
- echo -n "Flushing IPsec SA/SP database: "
- $SETKEY -F
- $SETKEY -FP
- echo "done."
+ log_begin_msg "Flushing IPsec SA/SP database: "
+
+ err=0
+ $SETKEY -F || err=1
+ $SETKEY -FP || err=1
+ log_end_msg $err
;;
restart|force-reload)
$0 stop
@@ -53,7 +57,7 @@
;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ log_success_msg "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
diff -Nru ipsec-tools-0.8.0/debian/racoon.init
ipsec-tools-0.8.0/debian/racoon.init
--- ipsec-tools-0.8.0/debian/racoon.init 2011-03-25 06:32:19.000000000
-0500
+++ ipsec-tools-0.8.0/debian/racoon.init 2011-06-08 12:34:43.000000000
-0500
@@ -71,6 +71,8 @@
fi
fi
+. /lib/lsb/init-functions
+
case $CONFIG_MODE in
racoon-tool)
# /usr/sbin/racoon-tool command complies with Debian Policy so just do this:
@@ -87,17 +89,19 @@
*)
case "$1" in
start)
- echo -n "Starting IKE (ISAKMP/Oakley) server: racoon"
- start-stop-daemon --start --quiet --exec ${DAEMON} --
${RACOON_ARGS}
- echo "."
+ log_begin_msg "Starting IKE (ISAKMP/Oakley) server: racoon"
+ err=0
+ start-stop-daemon --start --quiet --exec ${DAEMON} --
${RACOON_ARGS} || err=1
+ log_end_msg $err
;;
stop)
- echo -n "Stopping IKE (ISAKMP/Oakley) server: racoon"
+ log_begin_msg "Stopping IKE (ISAKMP/Oakley) server: racoon"
+ err=0
start-stop-daemon --stop --retry 25 --quiet --oknodo \
- --pidfile $PID_FILE --name racoon
+ --pidfile $PID_FILE --name racoon || err=1
rm -f $PID_FILE /var/run/racoon/racoon.sock
- echo "."
+ log_end_msg $err
;;
reload|force-reload)
@@ -112,7 +116,7 @@
*)
- echo "Usage: $0 {start|stop|reload|force-reload|restart}" >&2
+ log_success_msg "Usage: $0
{start|stop|reload|force-reload|restart}" >&2
exit 1
esac
;;
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
