fix bug #276: create root mount point

PVE/API2/OpenVZ.pm

@@ -141,7 +141,7 @@ __PACKAGE__->register_method({
 my $restore_openvz = sub {
     my ($private, $archive, $vmid, $force) = @_;
 
-    my $vzconf = PVE::OpenVZ::read_global_vz_config ();
+    my $vzconf = PVE::OpenVZ::read_global_vz_config();
     my $conffile = PVE::OpenVZ::config_file($vmid);
     my $cfgdir = dirname($conffile);
 
@@ -173,7 +173,7 @@ my $restore_openvz = sub {
 	};
 
 	mkpath $private || die "unable to create private dir '$private'";
-	mkpath $root || die "unable to create private dir '$private'";
+	mkpath $root || die "unable to create root dir '$root'";
 	
 	my $cmd = ['tar', 'xpf', $archive, '--totals', '--sparse', '-C', $private];
 
@@ -1090,6 +1090,12 @@ __PACKAGE__->register_method({
 		    PVE::Storage::activate_storage($stcfg, $sid);
 		}
 
+		my $vzconf = PVE::OpenVZ::read_global_vz_config();
+		
+		# make sure mount point is there (see bug #276)
+		my $root = PVE::OpenVZ::get_rootdir($veconf, $vmid);
+		mkpath $root || die "unable to create root dir '$root'";
+
 		my $cmd = ['vzctl', 'start', $vmid];
 	    
 		run_command($cmd);

debian/changelog.Debian

+pve-manager (2.2-29) unstable; urgency=low
+
+  * fix bug #276: create root mount point
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 05 Nov 2012 06:44:24 +0100
+
 pve-manager (2.2-28) unstable; urgency=low
 
   * remove hardcoded blowfish cipher

defines.mk

@@ -2,7 +2,7 @@ RELEASE=2.2
 
 VERSION=2.2
 PACKAGE=pve-manager
-PACKAGERELEASE=28
+PACKAGERELEASE=29
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5