diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-03-12 15:18:34 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-03-12 15:18:34 +0000 |
| commit | 18a5572ee8e3850f1d1f928d43d2e1799594dbd9 (patch) | |
| tree | a8d7ff802b09c27d3cf3d169167fb4371836cba9 /perl-install/commands.pm | |
| parent | ece757a4920eb93a5eef727f710094c65b767118 (diff) | |
| download | drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.gz drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.bz2 drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.xz drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.zip | |
fixed live update between GLIBC 2.1 and GLIBC 2.2. should work for other
combination but not tested. fixed locale usage and gtk environment
interaction (added LOCPATH, GCONV_PATH and GTK_EXE_PREFIX).
created LD_LOADER environment variable to keep track of right ELF loader
to be used for the GLIBC used by the live update. added internal PATH
to LD_LIBRARY_PATH as ELF loader only check this one and not PATH.
Diffstat (limited to 'perl-install/commands.pm')
| -rw-r--r-- | perl-install/commands.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm index fb905aaf5..ffdc306a7 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -438,7 +438,7 @@ sub insmod { }; #run_program::run("packdrake -x $cz /tmp $_.o"); } elsif (-e "/lib/modules.cpio.bz2") { - run_program::run("cd /tmp ; bzip2 -cd /lib/modules.cpio.bz2 | cpio -i $_.o"); + run_program::run("cd /tmp ; $ENV{LD_LOADER} bzip2 -cd /lib/modules.cpio.bz2 | $ENV{LD_LOADER} cpio -i $_.o"); } else { die "unable to find an archive for modules"; } @@ -564,7 +564,7 @@ sub install_cpio($$;@) { require run_program; my $more = join " ", map { $_ && "$_ $_/*" } @more; - run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -id $name $name/* $more"); + run_program::run("cd $dir ; $ENV{LD_LOADER} bzip2 -cd $cpio | $ENV{LD_LOADER} cpio -id $name $name/* $more"); "$dir/$name"; } @@ -579,7 +579,7 @@ sub report_bug { join '', map { chomp; "$_\n" } header("lspci"), detect_devices::stringlist(), header("pci_devices"), cat_("/proc/bus/pci/devices"), - header("fdisk"), arch() =~ /ppc/ ? `pdisk -l` : `fdisk -l`, + header("fdisk"), arch() =~ /ppc/ ? `$ENV{LD_LOADER} pdisk -l` : `$ENV{LD_LOADER} fdisk -l`, header("scsi"), cat_("/proc/scsi/scsi"), header("lsmod"), cat_("/proc/modules"), header("cmdline"), cat_("/proc/cmdline"), @@ -588,7 +588,7 @@ sub report_bug { header("partitions"), cat_("/proc/partitions"), header("cpuinfo"), cat_("/proc/cpuinfo"), header("syslog"), cat_("/tmp/syslog"), - header("ddcxinfos"), `ddcxinfos`, + header("ddcxinfos"), `$ENV{LD_LOADER} ddcxinfos`, header("ddebug.log"), cat_("/tmp/ddebug.log"), header("install.log"), cat_("/mnt/root/install.log"), ; |