summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-19 18:20:48 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-19 18:20:48 +0000
commit1091dc6cf8c86f30a6270b1d4f349ff7f92c5873 (patch)
treec0bc59ae23f945c54bc74eeb894581c1a8ec692a
parentcd38607b39bc611f247a18c8aa3f56fa25c7d880 (diff)
downloaddrakx-1091dc6cf8c86f30a6270b1d4f349ff7f92c5873.tar
drakx-1091dc6cf8c86f30a6270b1d4f349ff7f92c5873.tar.gz
drakx-1091dc6cf8c86f30a6270b1d4f349ff7f92c5873.tar.bz2
drakx-1091dc6cf8c86f30a6270b1d4f349ff7f92c5873.tar.xz
drakx-1091dc6cf8c86f30a6270b1d4f349ff7f92c5873.zip
(add_kernel) default to systemd (through "init=/bin/systemd")
-rw-r--r--perl-install/bootloader.pm6
-rw-r--r--perl-install/install/NEWS1
2 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 41b77b5b3..f8cdc6ba3 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -720,6 +720,12 @@ 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 7cdba6554..ffd8bd780 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,7 @@
- always favor packages with 'mga' extension when upgrading anything else
than Mageia
- install perl-Hal-Cdroms for urpmi when needed
+- default to systemd (through "init=/bin/systemd")
Version 13.64 - 08 September 2011