[pve-devel] r4938 - vzctl/trunk/debian

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-06 08:26:04 +0000 (Fri, 06 Aug 2010)
New Revision: 4938

Modified:
   vzctl/trunk/debian/changelog
   vzctl/trunk/debian/vzctl.postinst
   vzctl/trunk/debian/vzctl.postrm
Log:
correctly call ldconfig in postinst/postrm


Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2010-08-06 07:52:19 UTC (rev 4937)
+++ vzctl/trunk/debian/changelog	2010-08-06 08:26:04 UTC (rev 4938)
@@ -9,6 +9,8 @@
 
   * sysctl: set "net.ipv4.ip_forward = 1" - seems to be needed by newer
     kernels
+  
+  * correctly call ldconfig in postinst/postrm
 
  -- Proxmox Support Team <support at proxmox.com>  Thu, 05 Aug 2010 10:43:16 +0200
 

Modified: vzctl/trunk/debian/vzctl.postinst
===================================================================
--- vzctl/trunk/debian/vzctl.postinst	2010-08-06 07:52:19 UTC (rev 4937)
+++ vzctl/trunk/debian/vzctl.postinst	2010-08-06 08:26:04 UTC (rev 4938)
@@ -19,6 +19,7 @@
 
 case "$1" in
     configure)
+	ldconfig
 	# make sure we correct sysctl settings
 	/usr/share/doc/vzctl/examples/update_sysctl_conf
 	if [ -f "/etc/sysctl.d/vzctl" ] ; then

Modified: vzctl/trunk/debian/vzctl.postrm
===================================================================
--- vzctl/trunk/debian/vzctl.postrm	2010-08-06 07:52:19 UTC (rev 4937)
+++ vzctl/trunk/debian/vzctl.postrm	2010-08-06 08:26:04 UTC (rev 4938)
@@ -20,15 +20,6 @@
 case "$1" in
     purge)
         update-rc.d -f vz remove >/dev/null
-	# purge OpenVZ sysctl settings
-        if grep '#-- OpenVZ begin --#' /etc/sysctl.conf >/dev/null; then
-            rm -f /etc/sysctl.conf'{new}'
-            sed -e '/#-- OpenVZ begin --#/,/#-- OpenVZ end --#/d' \
-	            </etc/sysctl.conf >/etc/sysctl.conf'{new}'
-	    mv -f /etc/sysctl.conf'{new}' /etc/sysctl.conf
-	    echo "Remove OpenVZ sysctl settings ..."
-	    /sbin/sysctl -q -w
-	fi
 	# purge ve-configs
 	rm -rf \
 	    /etc/vz/conf \
@@ -47,8 +38,12 @@
 	# remove /vz link
 	# rm -rf /vz
     ;;
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    remove)
+        ldconfig
     ;;
+
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
     *)
         echo "postrm called with unknown argument \`$1'" >&2
         exit 1