--- trunk/vz-clone.pl 2007/10/05 01:01:13 29 +++ trunk/vz-clone.pl 2007/10/05 01:09:12 30 @@ -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 =~ m/(create|mount)/; my $orig_conf = "/etc/vz/conf/$VEID.conf";