Hi,
Attached is the diff for my ipvsadm 1.24+1.21-1.4 NMU.
--
Mohammed Adnène Trojette
diff -u ipvsadm-1.24+1.21/debian/copyright ipvsadm-1.24+1.21/debian/copyright
--- ipvsadm-1.24+1.21/debian/copyright
+++ ipvsadm-1.24+1.21/debian/copyright
@@ -21,7 +21,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
-
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301 USA.
+
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff -u ipvsadm-1.24+1.21/debian/ipvsadm.postinst ipvsadm-1.24+1.21/debian/ipvsadm.postinst
--- ipvsadm-1.24+1.21/debian/ipvsadm.postinst
+++ ipvsadm-1.24+1.21/debian/ipvsadm.postinst
@@ -12,6 +12,19 @@
db_get ipvsadm/daemon_method; DAEMON="$RET"
db_get ipvsadm/daemon_multicast_interface; IFACE="$RET"
+ if which ipvsadm &>/dev/null; then
+ # Regardless of if ipvs is built into the kernel or built as a module,
+ # if it is part of the kernel at all, it will be available after this
+ ipvsadm -L -n >& /dev/null || true
+ fi
+
+ if [ ! -f "/proc/net/ip_vs_conn" ]; then
+ db_fset ipvsadm/kernel_does_not_support_ipvs seen false
+ db_input high ipvsadm/kernel_does_not_support_ipvs || true
+ db_go
+ exit 0
+ fi
+
if [ "$DAEMON" = "none" ]; then
cat > $IPVSADM_CONFIG <<EOF1
# Do not edit! Use 'dpkg-reconfigure ipvsadm'.
diff -u ipvsadm-1.24+1.21/debian/ipvsadm.config ipvsadm-1.24+1.21/debian/ipvsadm.config
--- ipvsadm-1.24+1.21/debian/ipvsadm.config
+++ ipvsadm-1.24+1.21/debian/ipvsadm.config
@@ -8,17 +8,6 @@
db_version 2.0
-# Regardless of if ipvs is built into the kernel or built as a module,
-# if it is part of the kernel at all, it will be available after this
-ipvsadm -L -n >& /dev/null # Regardless of if ipvs is built the kernel or
-
-if [ ! -f "/proc/net/ip_vs_conn" ]; then
- db_fset ipvsadm/kernel_does_not_support_ipvs seen false
- db_input high ipvsadm/kernel_does_not_support_ipvs || true
- db_go
- exit 0
-fi
-
if [ -f $IPVSADM_CONFIG ]; then
. $IPVSADM_CONFIG
diff -u ipvsadm-1.24+1.21/debian/changelog ipvsadm-1.24+1.21/debian/changelog
--- ipvsadm-1.24+1.21/debian/changelog
+++ ipvsadm-1.24+1.21/debian/changelog
@@ -1,3 +1,17 @@
+ipvsadm (1.24+1.21-1.4) unstable; urgency=high
+
+ * Non-maintainer upload.
+
+ [ Pierre Habouzit ]
+ * Move ipvs detection into the postinst, so that we can rely on the ipvsadm
+ tool, guard that call to avoid any problems. (Closes: #408245).
+
+ [ Mohammed Adnène Trojette ]
+ * High urgency for RC bug fixing.
+ * Update FSF address in debian/copyright.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Tue, 13 Feb 2007 19:12:11 +0100
+
ipvsadm (1.24+1.21-1.3) unstable; urgency=low
* Non-maintainer upload
