Postinst trigger improvements for images

PATCH New Otavio Salvador 1 participant 2 messages Mar 6, 2012

lore

Share & tools

lore

Otavio Salvador

author

2012-03-06 17:51 UTC #0 lore raw

cover Postinst trigger improvements for images

Please ONLY merge this after the equivalent changes are merged onto OE-Core.

The following changes since commit 13354c9e1993f6196c2c9f714a8c815f4fe27b54:

networkmanager: cleanup (2012-03-06 10:01:14 +0100)

are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (1):
systemd-compat-units: rename service to run postinst scripts

 .../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%)

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2012-03-06 17:51 UTC #1 lore raw

PATCH 1/1 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 <[email protected]>

---
 .../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%)

meta-oe/recipes-core/systemd/systemd-compat-units.bb +4 -4

index 9b60bbc..2cbce67 100644
@@ -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/

meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service renamed from meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service +3 -3

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
@@ -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

Signature · 1 line

1.7.2.5