From patchwork Fri Jan 25 14:59:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] systemd: set default.target to multi-user.target Date: Fri, 25 Jan 2013 14:59:36 -0000 From: Radu Moisan X-Patchwork-Id: 43379 Message-Id: <1359125976-26763-1-git-send-email-radu.moisan@intel.com> To: openembedded-core@lists.openembedded.org this fixes a service dependency issue; while graphical.target is the default mode, systemd will try to start display-manager.service which is not available. Signed-off-by: Radu Moisan --- meta/conf/distro/include/default-distrovars.inc | 3 +++ meta/recipes-core/systemd/systemd_196.bb | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index f073547..c21d9a3 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -22,6 +22,9 @@ DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" DISTRO_FEATURES_INITMAN ?= "sysvinit" DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}" +# "multi-user" vs "graphical" +SYSTEMD_DEFAULT_TARGET ?= "multi-user" + IMAGE_FEATURES ?= "" # This is a list of packages that are used by the build system to build the distribution, they are not diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb index a78a8a6..4b97774 100644 --- a/meta/recipes-core/systemd/systemd_196.bb +++ b/meta/recipes-core/systemd/systemd_196.bb @@ -95,6 +95,11 @@ do_install() { install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + + + if [ -n ${SYSTEMD_DEFAULT_TARGET} ]; then + ln -s ${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET}.target ${D}${sysconfdir}/systemd/system/default.target + fi } python populate_packages_prepend (){