summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-11-25 19:49:44 +0000
committerFrancois Pons <fpons@mandriva.com>2002-11-25 19:49:44 +0000
commitd6ccb52c38606696e964bd1e485c1e2de4bc3298 (patch)
tree59dd5f8d511323fe6ab8063080b2198546db795a
parentc951a971ac367304c301be7a2839e7a023bfaa04 (diff)
downloaddrakx-d6ccb52c38606696e964bd1e485c1e2de4bc3298.tar
drakx-d6ccb52c38606696e964bd1e485c1e2de4bc3298.tar.gz
drakx-d6ccb52c38606696e964bd1e485c1e2de4bc3298.tar.bz2
drakx-d6ccb52c38606696e964bd1e485c1e2de4bc3298.tar.xz
drakx-d6ccb52c38606696e964bd1e485c1e2de4bc3298.zip
synced with latest change to HP version (and now HP is in CVS).
-rwxr-xr-xrescue/tree/etc/oem-all9
1 files changed, 5 insertions, 4 deletions
diff --git a/rescue/tree/etc/oem-all b/rescue/tree/etc/oem-all
index 6196d5441..9f4b2cd09 100755
--- a/rescue/tree/etc/oem-all
+++ b/rescue/tree/etc/oem-all
@@ -118,9 +118,10 @@ unless (-e "/cdrom/VERSION") {
}
#- using default options for HP.
-#- $options{free_size} = 500;
-#- $options{free_primary} = 1;
-#- $options{free_fs} = 'fat16';
+$options{free_size} = 500;
+$options{free_primary} = 1;
+$options{free_fs} = 'fat16';
+$options{boot_entries} = 'linux,linux-nonfb,failsafe,floppy';
open F, "/cdrom/VERSION" or die "no installation cdrom found on $cd";
while (<F>) {
@@ -442,7 +443,7 @@ if (open F, ">/hd/Mandrake/oem_patch.pl") {
#- and select at least GAMES group, everything else has
#- already be selected during master preparation.
$o->{compssListLevel} = 4;
- $o->{compssUsersChoice}{GAMES} = 1;
+ $o->{compssUsersChoice}{$_} = 1 foreach qw(GAMES VIDEO AUDIO GRAPHICS);
pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $o->{compssListLevel}, $availableCorrected);
$availableCorrected;