--- trunk/vz-clone.pl	2007/10/04 23:19:33	25
+++ trunk/vz-clone.pl	2007/10/05 01:09:12	30
@@ -10,36 +10,46 @@
 
 my ( $action, $VEID ) = @ARGV;
 
-my $valid_actions = 'create|umount|destroy';
+my $use_snapshot = 0;
+
+my $valid_actions = 'create|mount|umount|destroy';
 
 die "Usage: $0 ($valid_actions) VEID\n\n",vzlist unless $VEID && $action && $action =~ m/($valid_actions)/;
 
-if ( $action eq 'destroy' ) {
+my $CVEID = "10$VEID";
+
+sub vzctl_stop {
+	my $veid = shift;
 	my $vzlist = vzlist();
-	if ( $vzlist =~ m/$VEID/ ) {
-		print "stop $VEID\n";
-		vzctl('stop', $VEID);
+	if ( $vzlist =~ m/$veid/ ) {
+		print "stop $veid\n";
+		vzctl('stop', $veid);
 	}
 }
 
-if ( $action =~ m/(umount|destroy)/ ) {
+if ( $action eq 'create' ) {
+	vzctl_stop( $CVEID );
+} elsif ( $action eq 'destroy' ) {
+	vzctl_stop( $VEID );
+}
+
+
+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!-clone-$VEID$! ) {
+		} elsif ( $v[2] =~ m!vz-clone-$CVEID$! ) {
 			$clone = $v[2];
 		}
 	}
 	umount( $clone ) if $clone;
-}
 
-#die "unknown action: $action" unless $action eq 'create';
-exit unless $action eq 'create';
+	exit if $action eq 'umount';
+}
 
-my $CVEID = "10$VEID";
 
 my $orig_conf = "/etc/vz/conf/$VEID.conf";
 
@@ -73,6 +83,7 @@
 
 sub copy_files {
 	my ( $from, $to ) = @_;
+	return if $action ne 'create';
 	warn "rsync $from -> $to\n";
 	rsync('-raSHAD', "$from/", "$to/" );
 }
@@ -82,7 +93,7 @@
 	my ( $vz_lv_path, $vz_lv_name ) = ( $1, $2 ) if ( $vz_lv =~ m!^(.+)/([^/]+)$! );
 
 	my $snap = $vz_lv_name . '-snap';
-	my $clone = "$vz_lv_name-clone-$CVEID";
+	my $clone = "vz-clone-$CVEID";
 
 	sub do_mount {
 		my ( $from, $to ) = @_;
@@ -105,17 +116,21 @@
 		mount( '--bind', $from, $to );
 	}
 
-	print "Creating $snap_size snapshot $snap from $vz_lv\n";
-	lvcreate( '--size', $snap_size, '--snapshot', '--name', $snap, $vz_lv );
+	if ( $use_snapshot ) {
 
-	do_mount( "$vz_lv_path/$snap", "/tmp/$snap" );
+		print "Creating $snap_size snapshot $snap from $vz_lv\n";
+		lvcreate( '--size', $snap_size, '--snapshot', '--name', $snap, $vz_lv );
+
+		do_mount( "$vz_lv_path/$snap", "/tmp/$snap" );
+	
+	}
 
-	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" );
@@ -129,20 +144,29 @@
 	mount_bind( "/tmp/$clone/private", "$vz/private/$CVEID" );
 	mount_bind( "/tmp/$clone/root", "$vz/root/$CVEID" );
 
-	copy_files( "/tmp/$snap/private/$VEID", "$vz/private/$CVEID" );
+	if ( $use_snapshot ) {
+
+		copy_files( "/tmp/$snap/private/$VEID", "/tmp/$clone/private" );
+
+		print "Cleanup\n";
 
-	print "Cleanup\n";
+		#umount( "$vz_lv_path/$clone" );
+		umount( "$vz_lv_path/$snap" );
 
-	#umount( "$vz_lv_path/$clone" );
-	umount( "$vz_lv_path/$snap" );
+		lvremove( '-f', "$vz_lv_path/$snap" );
 
-	lvremove( '-f', "$vz_lv_path/$snap" );
+	} else {
+		copy_files( "$vz/private/$VEID", "/tmp/$clone/private" );
+
+	}
 
 } else {
 
 	copy_files( "$vz/private/$VEID", "$vz/private/$CVEID" );
 }
 
+exit if $action eq 'mount';
+
 my $note = "# modified by $0\n";
 
 sub fix_ip {