xen-create-image: Don't delete configuration file if it already exists. (Closes: #520177)
This commit is contained in:
parent
da302cdd1d
commit
fab5bc9861
@ -3483,7 +3483,8 @@ sub runXenConfigCreation
|
||||
logprint("The Xen configuration file $file exists\n");
|
||||
logprint("Specify --force to force overwriting it.\n");
|
||||
logprint("Aborting\n");
|
||||
$FAIL = 1;
|
||||
# FAIL = 2 will keep existing config file
|
||||
$FAIL = 2;
|
||||
exit 127;
|
||||
}
|
||||
}
|
||||
@ -3748,7 +3749,7 @@ sub END
|
||||
# Did we fail? If so then we should remove the broken installation,
|
||||
# unless "--keep" was specified.
|
||||
#
|
||||
if ( $FAIL && ( !$CONFIG{ 'keep' } ) )
|
||||
if ( ($FAIL == 1) && ( !$CONFIG{ 'keep' } ) )
|
||||
{
|
||||
|
||||
#
|
||||
|
||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -9,6 +9,8 @@ xen-tools (4.2-1) UNRELEASED; urgency=low
|
||||
* Make sure, MAKEDEV is found in either /dev/ or /sbin/ (Closes:
|
||||
#502798, #515228)
|
||||
* Change rinse path to /usr/sbin/. (Closes: #511211)
|
||||
* Don't delete configuration file if it already exists when
|
||||
xen-create-image is run. (Closes: #520177)
|
||||
|
||||
--
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user