systemd-compat-units: run-postinsts fix script link
in
commit fe039170236080291c0220476a5809774f82ee5c
Author: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Date: Wed Oct 2 10:55:32 2013 +0000
systemd-compat-units: Use correct run-postinsts script link
OE-Core commit 75a14923da
has moved
run-postinsts script execution from S98 to S99 in rcS.d. run-postinsts.service
should check for this script and run it on first boot rather than
S98run-postinsts, which is for opkg/dpkg.
the link was corrected but the mentioned commit is not available. Instead of
reverting, we use the same variable as opkg for init script ordering and drop
a note in case somebody wants to change default.
(From OE-Core master rev: 7aabc9408fb382f0ae39f9932b6d9ac391528b76)
(From OE-Core rev: 91a51e10392c0f802d6c329ad2b11ae82c55f171)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9f52614bd6
commit
52bc1c3dd7
|
@ -14,6 +14,8 @@ SRC_URI = "file://*.service"
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${systemd_unitdir}/system/basic.target.wants
|
install -d ${D}${systemd_unitdir}/system/basic.target.wants
|
||||||
install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
|
install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
|
||||||
|
sed -i -e 's,@POSTINSTALL_INITPOSITION@,${POSTINSTALL_INITPOSITION},g' \
|
||||||
|
${WORKDIR}/run-postinsts.service
|
||||||
install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
|
install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
|
||||||
ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
|
ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
|
||||||
ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
|
ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
|
||||||
|
@ -53,4 +55,8 @@ pkg_postinst_${PN} () {
|
||||||
FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
|
FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
|
||||||
RDPEPENDS_${PN} = "systemd"
|
RDPEPENDS_${PN} = "systemd"
|
||||||
|
|
||||||
|
# Define a variable to allow distros to run configure earlier.
|
||||||
|
# (for example, to enable loading of ethernet kernel modules before networking starts)
|
||||||
|
# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
|
||||||
|
# changes in opkg.inc
|
||||||
|
POSTINSTALL_INITPOSITION ?= "98"
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Run pending postinsts
|
Description=Run pending postinsts
|
||||||
DefaultDependencies=no
|
DefaultDependencies=no
|
||||||
ConditionPathExists=|/etc/rcS.d/S99run-postinsts
|
ConditionPathExists=|/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
|
||||||
After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
|
After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
|
||||||
Before=sysinit.target
|
Before=sysinit.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/etc/rcS.d/S99run-postinsts
|
ExecStart=/etc/rcS.d/S@POSTINSTALL_INITPOSITION@run-postinsts
|
||||||
RemainAfterExit=No
|
RemainAfterExit=No
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
StandardOutput=syslog
|
StandardOutput=syslog
|
||||||
|
|
|
@ -104,4 +104,6 @@ BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
# Define a variable to allow distros to run configure earlier.
|
# Define a variable to allow distros to run configure earlier.
|
||||||
# (for example, to enable loading of ethernet kernel modules before networking starts)
|
# (for example, to enable loading of ethernet kernel modules before networking starts)
|
||||||
|
# note: modifying name or default value for POSTINSTALL_INITPOSITION requires
|
||||||
|
# changes in systemd-compat-units.bb
|
||||||
POSTINSTALL_INITPOSITION ?= "98"
|
POSTINSTALL_INITPOSITION ?= "98"
|
||||||
|
|
Loading…
Reference in New Issue