summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrescue/tree/etc/oem8
1 files changed, 8 insertions, 0 deletions
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index 3601fb71e..7dc653c1e 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -346,6 +346,14 @@ if (-e "/cdrom/oem/vmlinuz" && -e "/cdrom/oem/all.rdz") {
} elsif (-e "/cdrom/boot/vmlinuz" && -e "/cdrom/boot/hd.rdz") {
system "cp", "-a", "/cdrom/boot/vmlinuz", "/hd/boot/vmlinuz";
system "cp", "-a", "/cdrom/boot/hd.rdz", "/hd/boot/all.rdz";
+} elsif (-e "/cdrom/images/hd.img") {
+ mkdir "/tmp/hd";
+ system "modprobe", "loop";
+ system "modprobe", "vfat";
+ system "mount", "-t", "vfat", "/cdrom/images/hd.img", "/tmp/hd", "-o", "loop";
+ system "cp", "-a", "/tmp/hd/vmlinuz", "/hd/boot/vmlinuz";
+ system "cp", "-a", "/tmp/hd/hd.rdz", "/hd/boot/all.rdz";
+ system "umount", "/tmp/hd";
} else {
die "no installation stage1 found";
}
$bundle_info);
if ($bundle_info->{status}) {
- my ($media, $mirror) = ($bundle_info->{data}->{media_name}, $bundle_info->{data}->{mirror});
+ my @bundles;
+ my ($media, $mirror, $bundle) = ($bundle_info->{data}->{media_name}, $bundle_info->{data}->{mirror}, $bundle_info->{data}->{bundle});
add_media($media, $mirror, 'hdlist.cz');
- install_pkgs($int, $bundle_info->{data}->{bundle}, $media);
+ $bundle =~ s/\.rpm$//;
+ push(@bundles, $bundle);
+ install_pkgs($in, \@bundles, $media);
}
}
@@ -208,18 +214,6 @@ sub my_fullname {
"$name-$version-$release";
}
-sub split_contents {
- my $cont = shift;
- my ($elem, $s);
- $s = [ split /\n/, $cont ];
- $elem->{torf} = $s->[0];
- if ($elem->{torf} eq 'TRUE') {
- ($elem->{torf}, $elem->{NEWKEY}, $elem->{OLDKEY}, $elem->{FTP}) = splice(@$s, 0, 4);
- ($elem->{sched}, $elem->{nosched}) = partition { /(i586|ppc|ia64|noarch|x86_64|amd64|ppc64)$/ } @$s;
- }
- $elem;
-}
-
sub auto_install_rpms {
my ($pkgs) = shift;
my @pkg;