summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-09-13 10:15:00 +0000
committerFrancois Pons <fpons@mandriva.com>2002-09-13 10:15:00 +0000
commit1dea3aa455e88e3fd99fe18b2cdac8707e9cf5a3 (patch)
tree79f25ad0c083adc379abcf3857116d1e0a4943a4
parent086838ecd8642f297a1892e7442a2b00c4591df0 (diff)
downloaddrakx-1dea3aa455e88e3fd99fe18b2cdac8707e9cf5a3.tar
drakx-1dea3aa455e88e3fd99fe18b2cdac8707e9cf5a3.tar.gz
drakx-1dea3aa455e88e3fd99fe18b2cdac8707e9cf5a3.tar.bz2
drakx-1dea3aa455e88e3fd99fe18b2cdac8707e9cf5a3.tar.xz
drakx-1dea3aa455e88e3fd99fe18b2cdac8707e9cf5a3.zip
fixed for newer perl 5.8.0 (vendor_perl directory).
fixed to kill devfsd before.
-rwxr-xr-xperl-install/live_install29
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/live_install2 b/perl-install/live_install2
index 58c5e9e83..68ffa528b 100755
--- a/perl-install/live_install2
+++ b/perl-install/live_install2
@@ -4,6 +4,9 @@ my $dir = `pwd`;
chomp $dir;
$dir .= "/../../..";
+#- allow devfsd to enable a faster upgrade.
+system "killall devfsd >/dev/null 2>/dev/null";
+
#- perl version of the install, we use directly the version we found,
#- this means there SHOULD BE no module compiled for an older version of perl
#- which will be used by DrakX.
@@ -18,7 +21,11 @@ $ENV{PERL5LIB} = join ":", map { "$dir/usr/lib/perl5/$_" } ("$version/$arch",
"$version",
"site_perl/$version/$arch",
"site_perl/$version",
- "site_perl");
+ "site_perl",
+ "vendor_perl/$version/$arch",
+ "vendor_perl/$version",
+ "vendor_perl",
+ );
$ENV{LD_LIBRARY_PATH} = "$dir/usr/bin:$dir/bin:$dir/sbin:$dir/usr/sbin:$dir/usr/X11R6/bin:$dir/lib:$dir/usr/lib:$dir/usr/lib/perl5/$version/$arch/CORE";
$ENV{PATH} = join(":", map { "$dir/$_" } split ":", "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin") . ":$ENV{PATH}";
$ENV{SHARE_PATH} = "$dir/usr/share";