[oe-commits] Otavio Salvador : systemd-compat-units: rename service to run postinst scripts
git at git.openembedded.org
git at git.openembedded.org
Tue Mar 13 17:56:37 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: c8680dada53e771f0c57ee98f60d4fa6a15a545f
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c8680dada53e771f0c57ee98f60d4fa6a15a545f
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Fri Mar 9 16:20:15 2012 +0000
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 <otavio at ossystems.com.br>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
.../recipes-core/systemd/systemd-compat-units.bb | 8 ++++----
.../{opkg.service => run-postinsts.service} | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
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
More information about the Openembedded-commits
mailing list