diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-02-20 12:42:30 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-02-20 12:42:30 +0000 |
| commit | 6f9977f301789392bece6f37251d54e3ffd6bad0 (patch) | |
| tree | 94ace4db419d6551a99c1fa724d879827ff398e0 /perl-install/live_install2 | |
| parent | 1d27dbf5e28c61be9eeb078c44f2481fb25e7195 (diff) | |
| download | drakx-6f9977f301789392bece6f37251d54e3ffd6bad0.tar drakx-6f9977f301789392bece6f37251d54e3ffd6bad0.tar.gz drakx-6f9977f301789392bece6f37251d54e3ffd6bad0.tar.bz2 drakx-6f9977f301789392bece6f37251d54e3ffd6bad0.tar.xz drakx-6f9977f301789392bece6f37251d54e3ffd6bad0.zip | |
added RPMRC_FILE env variable to choose rpmrc file for rpmlib used
by DrakX, neccessary for live update from a 7.2 or older.
Check that if something goes wrong with rebuilddb, avoid removing
old rpm-3 db files.
Make sure live_install can start from top directory too.
Diffstat (limited to 'perl-install/live_install2')
| -rwxr-xr-x | perl-install/live_install2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/live_install2 b/perl-install/live_install2 index 0d86df719..6c0cb9ef5 100755 --- a/perl-install/live_install2 +++ b/perl-install/live_install2 @@ -8,7 +8,9 @@ $ENV{PERL5LIB} = join ":", map { "$dir/$_" } @INC; $ENV{LD_LIBRARY_PATH} = "$dir/lib:$dir/usr/lib:$dir/usr/lib/perl5/5.6.0/i386-linux/CORE"; $ENV{PATH} = join(":", map { "$dir/$_" } split ":", "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin") . ":$ENV{PATH}"; $ENV{SHARE_PATH} = "$dir/usr/share"; +$ENV{RPMRC_FILE} = "$dir/usr/lib/rpm/rpmrc"; +system "../../../lib/ld-linux.so.2", "../perl", "-i", "-pe", "s,(macrofiles:\\s*)(.*),$1$dir/usr/lib/rpm/macros:$2,", $ENV{RPMRC_FILE}; system "../../../lib/ld-linux.so.2", "../perl", "./install2", "--live", @ARGV; $ENV{DISPLAY} and system "xset", "-fp", "/tmp/drakx/mdkinst/usr/X11R6/lib/X11/fonts/"; |