[pve-devel] r4944 - in dab/trunk: . scripts

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-09 09:22:18 +0000 (Mon, 09 Aug 2010)
New Revision: 4944

Modified:
   dab/trunk/changelog.Debian
   dab/trunk/scripts/init.pl
Log:


Modified: dab/trunk/changelog.Debian
===================================================================
--- dab/trunk/changelog.Debian	2010-08-09 08:19:55 UTC (rev 4943)
+++ dab/trunk/changelog.Debian	2010-08-09 09:22:18 UTC (rev 4944)
@@ -3,6 +3,9 @@
   * bug fix: only print a warning for packages installed directly with
     'dpkg' (when there is no information in 'available' list)
 
+  * only mount /proc/ if not already mounted (avoid problems with vzctl
+    3.0.24)
+  
  -- Proxmox Support Team <support at proxmox.com>  Mon, 09 Aug 2010 10:18:28 +0200
 
 dab (1.1-4) unstable; urgency=low

Modified: dab/trunk/scripts/init.pl
===================================================================
--- dab/trunk/scripts/init.pl	2010-08-09 08:19:55 UTC (rev 4943)
+++ dab/trunk/scripts/init.pl	2010-08-09 09:22:18 UTC (rev 4944)
@@ -48,8 +48,10 @@
 # ignore runlevel change requests
 exit (0) if $$ != 1; 
 
-system ("mount -t proc proc /proc") == 0 ||
-    die "unable to mount proc filesystem\n";
+if (! -d "/proc/$$") {
+    system ("mount -t proc proc /proc") == 0 ||
+	die "unable to mount proc filesystem\n";
+}
 
 system ("hostname localhost") == 0 ||
     die "unable to set hostname\n";