From c8680dada53e771f0c57ee98f60d4fa6a15a545f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 9 Mar 2012 16:20:15 +0000 Subject: [PATCH] systemd-compat-units: rename service to run postinst scripts OE-Core uses run-postinsts script to trigger package configuration on first boot so the service ought to be named the same, for consistency. Signed-off-by: Otavio Salvador Signed-off-by: Koen Kooi --- meta-oe/recipes-core/systemd/systemd-compat-units.bb | 8 ++++---- .../{opkg.service => run-postinsts.service} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename meta-oe/recipes-core/systemd/systemd-compat-units/{opkg.service => run-postinsts.service} (64%) diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units.bb b/meta-oe/recipes-core/systemd/systemd-compat-units.bb index 9b60bbc8d6..2cbce67d6d 100644 --- a/meta-oe/recipes-core/systemd/systemd-compat-units.bb +++ b/meta-oe/recipes-core/systemd/systemd-compat-units.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r14" +PR = "r15" inherit allarch @@ -12,9 +12,9 @@ SRC_URI = "file://*.service" do_install() { install -d ${D}${base_libdir}/systemd/system/basic.target.wants install -d ${D}${base_libdir}/systemd/system/sysinit.target.wants/ - install -m 0644 ${WORKDIR}/opkg.service ${D}${base_libdir}/systemd/system - ln -sf ../opkg.service ${D}${base_libdir}/systemd/system/basic.target.wants/ - ln -sf ../opkg.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ + install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${base_libdir}/systemd/system + ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/basic.target.wants/ + ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ install -m 0644 ${WORKDIR}/machineid.service ${D}${base_libdir}/systemd/system ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service b/meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service similarity index 64% rename from meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service rename to meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service index 36cedf22b1..879a25157b 100644 --- a/meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service +++ b/meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service @@ -1,12 +1,12 @@ [Unit] -Description=Opkg first boot configure +Description=Run pending postinsts DefaultDependencies=no -ConditionPathExists=|/etc/rcS.d/S98configure +ConditionPathExists=|/etc/rcS.d/S98run-postinsts After=remount-rootfs.service Before=sysinit.target [Service] -ExecStart=/etc/rcS.d/S98configure +ExecStart=/etc/rcS.d/S98run-postinsts RemainAfterExit=No Type=oneshot StandardOutput=syslog