summaryrefslogtreecommitdiffstats
path: root/rescue/tree/etc/oem
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-18 08:44:44 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-18 08:44:44 +0000
commit73d07c1ae571d081320a3195458acb5ff261245f (patch)
tree8440d32ba21e0bb2a5ce06703bdcb06bff237053 /rescue/tree/etc/oem
parent45388c02d974222363e0d58ba499ffdce748841b (diff)
downloaddrakx-73d07c1ae571d081320a3195458acb5ff261245f.tar
drakx-73d07c1ae571d081320a3195458acb5ff261245f.tar.gz
drakx-73d07c1ae571d081320a3195458acb5ff261245f.tar.bz2
drakx-73d07c1ae571d081320a3195458acb5ff261245f.tar.xz
drakx-73d07c1ae571d081320a3195458acb5ff261245f.zip
finally work arounded rpm bug by flepied.
Diffstat (limited to 'rescue/tree/etc/oem')
-rwxr-xr-xrescue/tree/etc/oem12
1 files changed, 6 insertions, 6 deletions
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index c7d6d67a8..7c0cb40b9 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -446,7 +446,7 @@ close F;
system "rpm", "--root", "/mnt", "--initdb";
#- hack for rpm bug, copy environment of rpm before an throw install from that.
-system "tar cvf - /lib/l* /usr/lib/librpm* /bin/rpm /usr/bin/rpm* /usr/lib/rpm/* | tar xvf - -C /mnt";
+#system "tar cvf - /lib/l* /usr/lib/librpm* /bin/rpm /usr/bin/rpm* /usr/lib/rpm/* | tar xvf - -C /mnt";
#- copy and install from each cd image.
foreach my $medium (@media) {
@@ -475,10 +475,10 @@ foreach my $medium (@media) {
if (delete $pkg->{selected}) {
my $file = "/cdrom/$medium->{rpmsdir}/" . rpm_filename($pkg);
if (-e $file) {
- #system "rpm", "--root", "/mnt", "--nodeps", "--force", "--noscripts", "-ivh", $file;
- system "cp", $file, "/mnt";
- system "chroot", "/mnt", "rpm", "--nodeps", "--force", "--noscripts", "-ivh", rpm_filename($pkg);
- system "rm", ("/mnt" . rpm_filename($pkg));
+ system "rpm", "-ivh", "--root", "/mnt", "--nodeps", "--force", "--noscripts", $file;
+ #system "cp", $file, "/mnt";
+ #system "chroot", "/mnt", "rpm", "--nodeps", "--force", "--noscripts", "-ivh", rpm_filename($pkg);
+ #system "rm", ("/mnt" . rpm_filename($pkg));
}
}
} else {
@@ -493,7 +493,7 @@ foreach my $medium (@media) {
delete $pkg->{selected};
}
}
- system "rpm", "--root", "/mnt", "--nodeps", "--force", "-ivh", @files;
+ system "rpm", "-ivh", "--root", "/mnt", "--nodeps", "--force", @files;
print "Installed " . scalar(@files) . " packages\n";
scalar(grep { $_->{selected} || $_->{closure} } @{$packages->{depslist}}) == 0 and last;