--- trunk/vz-clone.pl	2007/10/04 23:42:24	27
+++ trunk/vz-clone.pl	2007/10/05 01:09:12	30
@@ -12,7 +12,7 @@
 
 my $use_snapshot = 0;
 
-my $valid_actions = 'create|umount|destroy';
+my $valid_actions = 'create|mount|umount|destroy';
 
 die "Usage: $0 ($valid_actions) VEID\n\n",vzlist unless $VEID && $action && $action =~ m/($valid_actions)/;
 
@@ -27,7 +27,6 @@
 	}
 }
 
-
 if ( $action eq 'create' ) {
 	vzctl_stop( $CVEID );
 } elsif ( $action eq 'destroy' ) {
@@ -35,22 +34,22 @@
 }
 
 
-if ( 1 || $action =~ m/(umount|destroy)/ ) {
+if ( $action =~ m/(create|umount|destroy)/ ) {
 	my $clone;
 	open(my $m, '-|', 'mount') || die "can't open mount: $!";
 	while(<$m>) {
 		my @v = split(/\s+/,$_);
-		if ( $v[2] =~ m!/(private|root)/$VEID$! && $v[5] =~ m/bind/ ) {
+		if ( $v[2] =~ m!/(private|root)/$CVEID$! && $v[5] =~ m/bind/ ) {
 			umount( $v[2] );
-		} elsif ( $v[2] =~ m!vz-clone-$VEID$! ) {
+		} elsif ( $v[2] =~ m!vz-clone-$CVEID$! ) {
 			$clone = $v[2];
 		}
 	}
 	umount( $clone ) if $clone;
+
+	exit if $action eq 'umount';
 }
 
-#die "unknown action: $action" unless $action eq 'create';
-exit unless $action eq 'create';
 
 my $orig_conf = "/etc/vz/conf/$VEID.conf";
 
@@ -84,6 +83,7 @@
 
 sub copy_files {
 	my ( $from, $to ) = @_;
+	return if $action ne 'create';
 	warn "rsync $from -> $to\n";
 	rsync('-raSHAD', "$from/", "$to/" );
 }
@@ -125,12 +125,12 @@
 	
 	}
 
-	my $clone_size = fs_quota( $VEID ) . 'k';
 	my $vg_name = $1 if ( $vz_lv_path =~ m!/([^/]+)/*$! );
 
 	if ( lvdisplay( "$vz_lv_path/$clone" ) ) {
 		warn "using existing $vz_lv_path/$clone\n";
 	} else {
+		my $clone_size = fs_quota( $VEID ) . 'k';
 		print "Creating LV $clone ($clone_size bytes) in VG $vg_name for $VEID clone filesystem\n";
 		lvcreate( '--size', $clone_size, '--name', $clone, $vg_name );
 		mke2fs( '-m', 0, '-j', "$vz_lv_path/$clone" );
@@ -146,7 +146,7 @@
 
 	if ( $use_snapshot ) {
 
-		copy_files( "/tmp/$snap/private/$VEID", "$vz/private/$CVEID" );
+		copy_files( "/tmp/$snap/private/$VEID", "/tmp/$clone/private" );
 
 		print "Cleanup\n";
 
@@ -156,7 +156,7 @@
 		lvremove( '-f', "$vz_lv_path/$snap" );
 
 	} else {
-		copy_files( "$vz/private/$VEID", "$vz/private/$CVEID" );
+		copy_files( "$vz/private/$VEID", "/tmp/$clone/private" );
 
 	}
 
@@ -165,6 +165,8 @@
 	copy_files( "$vz/private/$VEID", "$vz/private/$CVEID" );
 }
 
+exit if $action eq 'mount';
+
 my $note = "# modified by $0\n";
 
 sub fix_ip {