summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-12-14 22:49:18 +0000
committerOlivier Blin <blino@mageia.org>2011-12-14 22:49:18 +0000
commite438b2ae5cae070f0b4ec66a1d9e9b3e34e1377c (patch)
tree6d4786a59bc288dd7c5e3b791a453d5465c6ccb1
parent2cf985c77a51bae94daaeb79d025bb3ef47ec291 (diff)
downloaddrakx-e438b2ae5cae070f0b4ec66a1d9e9b3e34e1377c.tar
drakx-e438b2ae5cae070f0b4ec66a1d9e9b3e34e1377c.tar.gz
drakx-e438b2ae5cae070f0b4ec66a1d9e9b3e34e1377c.tar.bz2
drakx-e438b2ae5cae070f0b4ec66a1d9e9b3e34e1377c.tar.xz
drakx-e438b2ae5cae070f0b4ec66a1d9e9b3e34e1377c.zip
do not hardcode systemd default through kernel command line, it should be easily overridable by just picking the proper init package
-rw-r--r--perl-install/bootloader.pm6
-rw-r--r--perl-install/install/NEWS3
2 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f8cdc6ba3..41b77b5b3 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -720,12 +720,6 @@ sub add_kernel {
$v->{append} = pack_append($simple, $dict);
}
- if (-e "$::prefix/bin/systemd") {
- log::l("defaulting to systemd");
- #@$dict = grep { $_->[0] ne 'devfs' } @$dict;
- $v->{append} .= " init=/bin/systemd";
- }
-
#- new versions of yaboot do not handle symlinks
$b_nolink ||= arch() =~ /ppc/;
$b_no_initrd //= (arch() =~ /mips|arm/) && !detect_devices::is_mips_gdium();
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 13a8ceb3a..341b89bba 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- do not hardcode systemd default through kernel command line, it
+ should be easily overridable by just picking the proper init package
+
Version 13.73 - 11 December 2011
- Mageia 2 Alpha 2 banner