2006-06-24 22:18:37 by steve
Only read the configuration file if it exists.
See Debian bug:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=375267
This commit is contained in:
parent
c51de7825e
commit
45144ab05b
@ -433,7 +433,7 @@ Install an X11 server, using VNC and XDM
|
||||
--
|
||||
http://www.steve.org.uk/
|
||||
|
||||
$Id: xen-create-image,v 1.45 2006-06-24 14:23:33 steve Exp $
|
||||
$Id: xen-create-image,v 1.46 2006-06-24 22:18:37 steve Exp $
|
||||
|
||||
=cut
|
||||
|
||||
@ -498,9 +498,12 @@ setupDefaultOptions();
|
||||
|
||||
|
||||
#
|
||||
# Read the global configuration file.
|
||||
# Read the global configuration file if it exists.
|
||||
#
|
||||
readConfigurationFile();
|
||||
if ( -e "/etc/xen-tools/xen-tools.conf" )
|
||||
{
|
||||
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
@ -730,7 +733,7 @@ sub setupDefaultOptions
|
||||
|
||||
sub readConfigurationFile
|
||||
{
|
||||
my $file = '/etc/xen-tools/xen-tools.conf';
|
||||
my ($file) = ( @_ );
|
||||
my $line = "";
|
||||
|
||||
|
||||
@ -848,7 +851,7 @@ sub parseCommandLineArguments
|
||||
|
||||
if ( $VERSION )
|
||||
{
|
||||
my $REVISION = '$Revision: 1.45 $';
|
||||
my $REVISION = '$Revision: 1.46 $';
|
||||
|
||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user