From patchwork Tue Mar 6 17:42:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-oe, 1/1] systemd-compat-units: rename service to run postinst scripts Date: Tue, 06 Mar 2012 17:42:39 -0000 From: Otavio Salvador X-Patchwork-Id: 22829 Message-Id: To: openembedded-devel@lists.openembedded.org 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 --- .../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 9b60bbc..2cbce67 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 36cedf2..879a251 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