From 8bf52a86b3f55781ceafe830ca27f8d294b7251d Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sesse@debian.org>
Date: Tue, 30 Oct 2007 17:18:12 +0100
Subject: [PATCH] Imported Debian patch 1.1.1-6
---
debian/changelog | 10 ++++++----
debian/nfs-common.init | 42 ++++++++++++++++++++++++------------------
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0ee6cfd..a9e506b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-nfs-utils (1:1.1.1-5) unstable; urgency=low
+nfs-utils (1:1.1.1-6) unstable; urgency=low
- * Fixed syntax error in nfs-common. Closes: #448538, #448607.
- Patch by Alban Browaeys <prahal@yahoo.com>
+ * Fix typo in init script. (Closes: #448538, #448607, #448564)
+ * In the init script, save the value of $? into a variable instead of using
+ $? over and over again, as it will get clobbered after the first command
+ using it.
- -- Anibal Monsalve Salazar <anibal@debian.org> Tue, 30 Oct 2007 22:41:12 +1100
+ -- Steinar H. Gunderson <sesse@debian.org> Tue, 30 Oct 2007 17:18:12 +0100
nfs-utils (1:1.1.1-4) unstable; urgency=low
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index a8ca61c..c81edfb 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -124,9 +124,10 @@ case "$1" in
log_progress_msg "statd"
start-stop-daemon --start --oknodo --quiet \
--exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
- if [ $? != 0 ]; then
- log_end_msg $?
- exit $?
+ RET=$?
+ if [ $RET != 0 ]; then
+ log_end_msg $RET
+ exit $RET
fi
fi
@@ -146,9 +147,10 @@ case "$1" in
log_progress_msg "idmapd"
start-stop-daemon --start --oknodo --quiet \
--exec /usr/sbin/rpc.idmapd
- if [ $? != 0 ]; then
- log_end_msg $?
- exit $?
+ RET=$?
+ if [ $RET != 0 ]; then
+ log_end_msg $RET
+ exit $RET
fi
fi
if [ "$NEED_GSSD" = yes ]
@@ -165,9 +167,10 @@ case "$1" in
start-stop-daemon --start --oknodo --quiet \
--exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
- if [ $? != 0 ]; then
- log_end_msg $?
- exit $?
+ RET=$?
+ if [ $RET != 0 ]; then
+ log_end_msg $RET
+ exit $RET
fi
fi
fi
@@ -183,9 +186,10 @@ case "$1" in
log_progress_msg "gssd"
start-stop-daemon --stop --oknodo --quiet \
--name rpc.gssd
- if [ $? != 0 ]; then
- log_end_msg $?
- exit $?
+ RET=$?
+ if [ $RET != 0 ]; then
+ log_end_msg $RET
+ exit $RET
fi
fi
if [ "$NEED_IDMAPD" = yes ]
@@ -193,9 +197,10 @@ case "$1" in
log_progress_msg "idmapd"
start-stop-daemon --stop --oknodo --quiet \
--name rpc.idmapd
- if [ $? != 0 ]; then
- log_end_msg $?
- exit $?
+ RET=$?
+ if [ $RET != 0 ]; then
+ log_end_msg $RET
+ exit $RET
fi
fi
if [ "$NEED_STATD" = yes ]
@@ -203,9 +208,10 @@ case "$1" in
log_progress_msg "statd"
start-stop-daemon --stop --oknodo --quiet \
--name rpc.statd
- if [ $? != 0 ]; then
- log_end_msg $?
- exit $?
+ RET=$?
+ if [ $RET != 0 ]; then
+ log_end_msg $RET
+ exit $RET
fi
fi
do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true
--
2.39.5