From d501818459ab8aa848a592dfa67e919e0e5385af Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 31 Oct 2003 11:04:47 +0000 Subject: don't getFile VERSION in move or testing --- perl-install/install2.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'perl-install/install2.pm') diff --git a/perl-install/install2.pm b/perl-install/install2.pm index cc57cd587..7e75d2284 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -558,12 +558,14 @@ sub main { $o->{allowFB} = listlength(cat_("/proc/fb")); - my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 }; - $::corporate = 1 if $VERSION =~ /corporate/i; - $o->{meta_class} = 'desktop' if $VERSION =~ /desktop|discovery/i; - $o->{meta_class} = 'download' if $VERSION =~ /download/i; - $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i; - $o->{meta_class} = 'server' if $VERSION =~ /server|prosuite/i; + if (!$::move && !$::testing) { + my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 }; + $::corporate = 1 if $VERSION =~ /corporate/i; + $o->{meta_class} = 'desktop' if $VERSION =~ /desktop|discovery/i; + $o->{meta_class} = 'download' if $VERSION =~ /download/i; + $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i; + $o->{meta_class} = 'server' if $VERSION =~ /server|prosuite/i; + } $o->{meta_class} eq 'discovery' and $o->{meta_class} = 'desktop'; if ($::oem) { $o->{partitioning}{use_existing_root} = 1; -- cgit v1.2.1