From c8680dada53e771f0c57ee98f60d4fa6a15a545f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 9 Mar 2012 16:20:15 +0000 Subject: 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 ++++---- .../systemd/systemd-compat-units/opkg.service | 17 ----------------- .../systemd/systemd-compat-units/run-postinsts.service | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service create mode 100644 meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service (limited to 'meta-oe') 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/opkg.service deleted file mode 100644 index 36cedf22b1..0000000000 --- a/meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Opkg first boot configure -DefaultDependencies=no -ConditionPathExists=|/etc/rcS.d/S98configure -After=remount-rootfs.service -Before=sysinit.target - -[Service] -ExecStart=/etc/rcS.d/S98configure -RemainAfterExit=No -Type=oneshot -StandardOutput=syslog -TimeoutSec=0 - -[Install] -WantedBy=basic.target -WantedBy=sysinit.target diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service new file mode 100644 index 0000000000..879a25157b --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service @@ -0,0 +1,17 @@ +[Unit] +Description=Run pending postinsts +DefaultDependencies=no +ConditionPathExists=|/etc/rcS.d/S98run-postinsts +After=remount-rootfs.service +Before=sysinit.target + +[Service] +ExecStart=/etc/rcS.d/S98run-postinsts +RemainAfterExit=No +Type=oneshot +StandardOutput=syslog +TimeoutSec=0 + +[Install] +WantedBy=basic.target +WantedBy=sysinit.target -- cgit 1.2.3-korg