summaryrefslogtreecommitdiffstats
path: root/rescue/tree/etc
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-19 16:21:24 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-19 16:21:24 +0000
commit31a454b0be1c0fbe4e60e347a14ffe7a6303f56d (patch)
tree28c92af692af208fa2b337713cc020e0ead3a679 /rescue/tree/etc
parent74177e6e2b96d3b96f2bea8ea00d4446f0020070 (diff)
downloaddrakx-31a454b0be1c0fbe4e60e347a14ffe7a6303f56d.tar
drakx-31a454b0be1c0fbe4e60e347a14ffe7a6303f56d.tar.gz
drakx-31a454b0be1c0fbe4e60e347a14ffe7a6303f56d.tar.bz2
drakx-31a454b0be1c0fbe4e60e347a14ffe7a6303f56d.tar.xz
drakx-31a454b0be1c0fbe4e60e347a14ffe7a6303f56d.zip
added support for passing kernel options to oem scrpit.
Diffstat (limited to 'rescue/tree/etc')
-rwxr-xr-xrescue/tree/etc/oem6
-rwxr-xr-xrescue/tree/etc/oem-all3
2 files changed, 7 insertions, 2 deletions
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index bf31cbda7..d8a8125c5 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -117,6 +117,9 @@ unless (-e "/cdrom/VERSION") {
system "mount", "-r", "-t", "iso9660", "/dev/$cd", "/cdrom";
}
+#- default options to be used.
+$options{kernel} = "acpi=off";
+
#- detect language used and default options.
my ($lang, $flang, $charset);
open F, "/cdrom/VERSION" or die "no installation cdrom found on $cd";
@@ -125,6 +128,7 @@ while (<F>) {
/\[lang[=:]([^]]*)\]/ and $options{lang} = $1;
/[\[\-]server[\]\-]/ and $options{server} = '';
/\[boot_entries[=:]([^]]*)\]/ and $options{boot_entries} = $1;
+ /\[kernel[=:]([^]]*)\]/ and $options{kernel} = $1;
/\[ext2\]/ and $options{fs} = "ext2";
/\[ext3\]/ and $options{fs} = "ext3";
}
@@ -477,7 +481,7 @@ if (defined $resize_fat_size) {
print F "timeout 0\n\n";
print F "title oem\n";
}
-print F "kernel (hd0,$instz)/boot/vmlinuz ramdisk_size=128000 acpi=off automatic=method:disk,disk:$hd,partition:$hdp$inst,directory:/ hd vga=788 fbeginner flang=$lang oem defcfg=/tmp/hdimage/Mandrake/oem_patch.pl\n";
+print F "kernel (hd0,$instz)/boot/vmlinuz ramdisk_size=128000 $options{kernel} automatic=method:disk,disk:$hd,partition:$hdp$inst,directory:/ hd vga=788 fbeginner flang=$lang oem defcfg=/tmp/hdimage/Mandrake/oem_patch.pl\n";
print F "initrd (hd0,$instz)/boot/all.rdz\n";
#- if a windows partition is available, add an entrie for it.
if (defined $resize_fat_size) {
diff --git a/rescue/tree/etc/oem-all b/rescue/tree/etc/oem-all
index f4aa357d0..b80e96694 100755
--- a/rescue/tree/etc/oem-all
+++ b/rescue/tree/etc/oem-all
@@ -122,6 +122,7 @@ $options{free_size} = 500;
$options{free_primary} = 1;
$options{free_fs} = 'fat16';
$options{boot_entries} = 'linux,linux-nonfb,failsafe,floppy';
+$options{kernel} = "acpi=off";
open F, "/cdrom/VERSION" or die "no installation cdrom found on $cd";
while (<F>) {
@@ -490,7 +491,7 @@ if (defined $resize_fat_size) {
print F "timeout 0\n\n";
print F "title oem\n";
}
-print F "kernel (hd0,$instz)/boot/vmlinuz ramdisk_size=128000 acpi=off automatic=method:disk,disk:$hd,partition:$hdp$inst,directory:/ hd vga=788 fbeginner oem defcfg=/tmp/hdimage/Mandrake/oem_patch.pl\n";
+print F "kernel (hd0,$instz)/boot/vmlinuz ramdisk_size=128000 $options{kernel} automatic=method:disk,disk:$hd,partition:$hdp$inst,directory:/ hd vga=788 fbeginner oem defcfg=/tmp/hdimage/Mandrake/oem_patch.pl\n";
print F "initrd (hd0,$instz)/boot/all.rdz\n";
#- if a windows partition is available, add an entrie for it.
if (defined $resize_fat_size) {