diff options
| author | Anne Nicolas <ennael@mageia.org> | 2015-04-06 23:20:04 +0200 |
|---|---|---|
| committer | Anne Nicolas <ennael@mageia.org> | 2015-04-06 23:20:04 +0200 |
| commit | af07ba8055bf75d5b096b254b175bea01bca6ea9 (patch) | |
| tree | c0df4811d7328604e7398e81bca12d460cbd7038 /images | |
| parent | 66a5e817f0cbba9c66b4be220f19914589a2b348 (diff) | |
| download | drakx-af07ba8055bf75d5b096b254b175bea01bca6ea9.tar drakx-af07ba8055bf75d5b096b254b175bea01bca6ea9.tar.gz drakx-af07ba8055bf75d5b096b254b175bea01bca6ea9.tar.bz2 drakx-af07ba8055bf75d5b096b254b175bea01bca6ea9.tar.xz drakx-af07ba8055bf75d5b096b254b175bea01bca6ea9.zip | |
add "noiswmd" to kernel command line to allow dmraid to manage and
start the devices
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | images/NEWS | 4 | ||||
| -rwxr-xr-x | images/make_boot_img | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile index ff41e7cab..1f7061951 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.17 +VERSION=2.18 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) diff --git a/images/NEWS b/images/NEWS index 7ab1ea59a..a285a0016 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,7 @@ +Version 2.18 - 6 April 2015 by Anne Nicolas + +- use noiswmd as default boot option (mga#11105) + Version 2.17 - 17 March 2015 by Thierry Vignaud - include virtio_rng diff --git a/images/make_boot_img b/images/make_boot_img index 5d65049f8..211192038 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -12,6 +12,7 @@ my ($arch) = $Config{archname} =~ /(.*?)-/; my $default_append = ''; my $default_acpi = ''; my $default_vga = "vga=788 splash quiet"; +my $default_iswmd = "noiswmd"; my $timeout = 150; my $lib = $arch eq 'x86_64' ? 'lib64' : 'lib'; my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin'; @@ -372,7 +373,7 @@ fallback 1 title Mageia Install root (hd0,0) -kernel /cooker/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga automatic=method:disk +kernel /cooker/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga $default_iswmd automatic=method:disk initrd /cooker/isolinux/alt0/all.rdz title Help |