Merge pull request #1031 from marineam/systemd

systemd updates, fixes journalctl

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild

@@ -121,7 +121,6 @@ RDEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-apps/shadow
 	sys-apps/systemd
-	sys-apps/systemd-sysv-utils
 	sys-apps/usbutils
 	sys-apps/util-linux
 	sys-fs/btrfs-progs

sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild

@@ -82,7 +82,6 @@ RDEPEND="${RDEPEND}
 	net-misc/gsutil
 	sys-apps/usbutils
 	sys-apps/systemd
-	sys-apps/systemd-sysv-utils
 	!sys-apps/nih-dbus-tool
 	=sys-devel/automake-1.10*
 	sys-fs/sshfs-fuse

sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask

@@ -1,3 +1,2 @@
 sys-apps/systemd
 sys-apps/systemd-ui
-sys-apps/systemd-sysv-utils

sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.use.force

@@ -1,8 +1,8 @@
 # Copyright (c) 2014 The CoreOS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-# disable gentoo-only bits
+# disable gentoo-only bits and replace sysvinit
-sys-apps/systemd vanilla
+sys-apps/systemd vanilla sysv-utils
 
 # dbus without systemd conflicts with systemd
 sys-apps/dbus systemd

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.149 2014/12/14 15:58:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.153 2014/12/26 19:58:55 floppym Exp $
 
 EAPI=5
 
@@ -36,7 +36,10 @@ SLOT="0/2"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
 	idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
-	selinux ssl terminal nls test vanilla xkb"
+	selinux ssl sysv-utils terminal test vanilla xkb"
+
+# Gentoo removed this use flag, we'll keep it for now
+IUSE+=" nls"
 
 MINKV="3.8"
 
@@ -64,6 +67,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( sys-libs/libseccomp:0= )
 	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
 	terminal? ( >=dev-libs/libevdev-1.2:0=
 		>=x11-libs/libxkbcommon-0.5:0=
 		>=x11-libs/libdrm-2.4:0= )
@@ -291,6 +297,8 @@ multilib_src_configure() {
 
 	if ! multilib_is_native_abi; then
 		myeconfargs+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+
 			ac_cv_search_cap_init=
 			ac_cv_header_sys_capability_h=yes
 		)
@@ -363,10 +371,25 @@ multilib_src_install_all() {
 	prune_libtool_files --modules
 	einstalldocs
 
-	# we just keep sysvinit tools, so no need for the mans
+	if use sysv-utils; then
-	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		for app in halt poweroff reboot runlevel shutdown telinit; do
-		|| die
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
-	rm "${D}"/usr/share/man/man1/init.1 || die
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${D}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Ensure journal directory has correct ownership/mode in inital image.
+	# This is fixed by systemd-tmpfiles *but* journald starts before that
+	# and will create the journal if the filesystem is already read-write.
+	# Conveniently the systemd Makefile sets this up completely wrong.
+	dodir /var/log/journal
+	fowners root:systemd-journal /var/log/journal
+	fperms 2755 /var/log/journal
 
 	systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
 	systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.149 2014/12/14 15:58:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.153 2014/12/26 19:58:55 floppym Exp $
 
 EAPI=5
 
@@ -36,7 +36,10 @@ SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
 	idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
-	selinux ssl terminal nls test vanilla xkb"
+	selinux ssl sysv-utils terminal test vanilla xkb"
+
+# Gentoo removed this use flag, we'll keep it for now
+IUSE+=" nls"
 
 MINKV="3.8"
 
@@ -64,6 +67,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( sys-libs/libseccomp:0= )
 	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
 	terminal? ( >=dev-libs/libevdev-1.2:0=
 		>=x11-libs/libxkbcommon-0.5:0=
 		>=x11-libs/libdrm-2.4:0= )
@@ -287,6 +293,8 @@ multilib_src_configure() {
 
 	if ! multilib_is_native_abi; then
 		myeconfargs+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+
 			ac_cv_search_cap_init=
 			ac_cv_header_sys_capability_h=yes
 		)
@@ -359,10 +367,25 @@ multilib_src_install_all() {
 	prune_libtool_files --modules
 	einstalldocs
 
-	# we just keep sysvinit tools, so no need for the mans
+	if use sysv-utils; then
-	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		for app in halt poweroff reboot runlevel shutdown telinit; do
-		|| die
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
-	rm "${D}"/usr/share/man/man1/init.1 || die
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${D}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Ensure journal directory has correct ownership/mode in inital image.
+	# This is fixed by systemd-tmpfiles *but* journald starts before that
+	# and will create the journal if the filesystem is already read-write.
+	# Conveniently the systemd Makefile sets this up completely wrong.
+	dodir /var/log/journal
+	fowners root:systemd-journal /var/log/journal
+	fperms 2755 /var/log/journal
 
 	systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
 	systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf

sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild

@@ -31,7 +31,6 @@ DEPEND="
 	sys-apps/less
 	sys-apps/sed
 	sys-apps/systemd
-	sys-apps/systemd-sysv-utils
 	sys-apps/util-linux
 	sys-fs/btrfs-progs
 	sys-fs/mdadm

sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/init/init-0.ebuild,v 1.16 2012/05/16 07:40:58 heroxbd Exp $
-
-DESCRIPTION="Virtual for various init implementations"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!prefix? (
-	kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6
-						 sys-apps/systemd-sysv-utils
-						 sys-process/runit ) )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)"
-DEPEND=""