diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-03-09 16:20:15 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-13 18:53:03 +0100 |
| commit | c8680dada53e771f0c57ee98f60d4fa6a15a545f (patch) | |
| tree | 3b443e183e812c9d26faf3708632d23e8f065ce9 /meta-oe/recipes-core/systemd | |
| parent | ae522fe36a87f40612f21ac4394e05d674a16745 (diff) | |
| download | meta-openembedded-c8680dada53e771f0c57ee98f60d4fa6a15a545f.tar.gz | |
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@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core/systemd')
| -rw-r--r-- | meta-oe/recipes-core/systemd/systemd-compat-units.bb | 8 | ||||
| -rw-r--r-- | meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service (renamed from meta-oe/recipes-core/systemd/systemd-compat-units/opkg.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 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" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
| 5 | 5 | ||
| 6 | PR = "r14" | 6 | PR = "r15" |
| 7 | 7 | ||
| 8 | inherit allarch | 8 | inherit allarch |
| 9 | 9 | ||
| @@ -12,9 +12,9 @@ SRC_URI = "file://*.service" | |||
| 12 | do_install() { | 12 | do_install() { |
| 13 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants | 13 | install -d ${D}${base_libdir}/systemd/system/basic.target.wants |
| 14 | install -d ${D}${base_libdir}/systemd/system/sysinit.target.wants/ | 14 | install -d ${D}${base_libdir}/systemd/system/sysinit.target.wants/ |
| 15 | install -m 0644 ${WORKDIR}/opkg.service ${D}${base_libdir}/systemd/system | 15 | install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${base_libdir}/systemd/system |
| 16 | ln -sf ../opkg.service ${D}${base_libdir}/systemd/system/basic.target.wants/ | 16 | ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/basic.target.wants/ |
| 17 | ln -sf ../opkg.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ | 17 | ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ |
| 18 | 18 | ||
| 19 | install -m 0644 ${WORKDIR}/machineid.service ${D}${base_libdir}/systemd/system | 19 | install -m 0644 ${WORKDIR}/machineid.service ${D}${base_libdir}/systemd/system |
| 20 | ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ | 20 | 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 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 @@ | |||
| 1 | [Unit] | 1 | [Unit] |
| 2 | Description=Opkg first boot configure | 2 | Description=Run pending postinsts |
| 3 | DefaultDependencies=no | 3 | DefaultDependencies=no |
| 4 | ConditionPathExists=|/etc/rcS.d/S98configure | 4 | ConditionPathExists=|/etc/rcS.d/S98run-postinsts |
| 5 | After=remount-rootfs.service | 5 | After=remount-rootfs.service |
| 6 | Before=sysinit.target | 6 | Before=sysinit.target |
| 7 | 7 | ||
| 8 | [Service] | 8 | [Service] |
| 9 | ExecStart=/etc/rcS.d/S98configure | 9 | ExecStart=/etc/rcS.d/S98run-postinsts |
| 10 | RemainAfterExit=No | 10 | RemainAfterExit=No |
| 11 | Type=oneshot | 11 | Type=oneshot |
| 12 | StandardOutput=syslog | 12 | StandardOutput=syslog |
