systemd: add back alternatives for init utitilies

PATCH In review Chen Qi 2 participants 5 messages Oct 22, 2018 – Oct 25, 2018

lore

Share & tools

lore

Chen Qi

author

2018-10-22 06:57 UTC #0 lore raw

v2 cover systemd: add back alternatives for init utitilies

Changes in V2:
* Remove 'init' from alternatives.

The following changes since commit 8e4c03744cfa8cc559682ebf7074643216dd2b9d:

oe-selftest: devtool: Support meta being a symbolic link (2018-10-21 21:30:35 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/systemd-alternatives
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-alternatives

Chen Qi (1):
systemd: add back alternatives for init utitilies

 meta/recipes-core/systemd/systemd_239.bb | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

Signature · 1 line

1.9.1

Chen Qi

author

2018-10-22 06:58 UTC #1 lore raw

PATCH v2 1/1 systemd: add back alternatives for init utitilies

Add back alternatives for init utilities to avoid regression.

These alternatives were removed when upgradeing systemd to 239. They were removed out of the logic that init utitilies should be bound to init manager. However, it turned out that two use cases were not covered.

1) initramfs using commands like 'reboot' from busybox.
2) Users use customized busybox defconfig which enables init utilities.

The first use case caused a regression bug in yocto.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12914
Patches were sent to fix the reboot problem.

But this is not enough. As we may have the second use case. In such situation, users will find themselves having regression error when using 'busybox + systemd' (and busybox is installed after systemd, overriding the systemd symlinks).

So in order to avoid regression, add back these alternatives.

Signed-off-by Chen Qi <[email protected]>

---
 meta/recipes-core/systemd/systemd_239.bb | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

meta/recipes-core/systemd/systemd_239.bb +20 -3

index bc16407..61159ad 100644
@@ -438,7 +438,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${base_sbindir}/runlevel \
                 ${base_sbindir}/telinit \
                 ${base_sbindir}/resolvconf \
-                ${base_sbindir}/reboot.systemd \
+                ${base_sbindir}/reboot \
                 ${base_sbindir}/init \
                 ${datadir}/dbus-1/services \
                 ${datadir}/dbus-1/system-services \

@@ -546,14 +546,31 @@ python __anonymous() {
         d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
 }
 
-ALTERNATIVE_${PN} = "resolv-conf reboot"
+ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel resolv-conf"
 
 ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd"
 ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
 ALTERNATIVE_PRIORITY[resolv-conf] ?= "50"
 
+ALTERNATIVE_TARGET[halt] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt"
+ALTERNATIVE_PRIORITY[halt] ?= "300"
+
+ALTERNATIVE_TARGET[reboot] = "${base_bindir}/systemctl"
 ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot"
-ALTERNATIVE_PRIORITY[reboot] = "100"
+ALTERNATIVE_PRIORITY[reboot] ?= "300"
+
+ALTERNATIVE_TARGET[shutdown] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown"
+ALTERNATIVE_PRIORITY[shutdown] ?= "300"
+
+ALTERNATIVE_TARGET[poweroff] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
+ALTERNATIVE_PRIORITY[poweroff] ?= "300"
+
+ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel"
+ALTERNATIVE_PRIORITY[runlevel] ?= "300"
 
 pkg_postinst_${PN} () {
 	sed -e '/^hosts:/s/\s*\<myhostname\>//' \

Signature · 1 line

1.9.1

Richard Purdie

2018-10-23 21:49 UTC #2 lore raw

Quoted 15 lines · Chen Qi

Add back alternatives for init utilities to avoid regression.
These alternatives were removed when upgradeing systemd to 239. They were removed out of the logic that init utitilies should be bound to init manager. However, it turned out that two use cases were not covered.
1) initramfs using commands like 'reboot' from busybox.
2) Users use customized busybox defconfig which enables init utilities.
The first use case caused a regression bug in yocto.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12914
Patches were sent to fix the reboot problem.

Quoted 8 lines

But this is not enough. As we may have the second use case. In such situation, users will find themselves having regression error when using 'busybox + systemd' (and busybox is installed after systemd, overriding the systemd symlinks).
So in order to avoid regression, add back these alternatives.
Signed-off-by Chen Qi <[email protected]>

Sorry but this is still failing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/35/builds/107/steps/7/logs/step7c

Cheers,

Richard

ChenQi

author

2018-10-24 06:09 UTC #3 lore raw

Quoted 24 lines · Richard Purdie

Quoted 15 lines · Chen Qi
Add back alternatives for init utilities to avoid regression.
These alternatives were removed when upgradeing systemd to 239. They were removed out of the logic that init utitilies should be bound to init manager. However, it turned out that two use cases were not covered.
1) initramfs using commands like 'reboot' from busybox.
2) Users use customized busybox defconfig which enables init utilities.
The first use case caused a regression bug in yocto.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12914
Patches were sent to fix the reboot problem.
Quoted 8 lines
But this is not enough. As we may have the second use case. In such situation, users will find themselves having regression error when using 'busybox + systemd' (and busybox is installed after systemd, overriding the systemd symlinks).
So in order to avoid regression, add back these alternatives.
Signed-off-by Chen Qi <[email protected]>

Quoted 10 lines

Sorry but this is still failing:
https://autobuilder.yoctoproject.org/typhoon/#/builders/35/builds/107/steps/7/logs/step7c
Cheers,
Richard

Hi Richard,

The failure is revealed by Kevin's patches regarding udev-extraconf. More particularly, it's the following patch that reveals the problem. "udev-extraconf: Use the canonical file name of systemd"

I've sent out a patch to remove udev-extraconf from packagegroup-core-lsb/-x11-sato to fix this failure.
I tested 'testimage + core-image-sato/lsb' with the following 5 patches (3 from Kevin which are now on master-next, 2 from me) with master branch, and the tests passed.
packagegroup-core-lsb/-x11-sato: no udev-extraconf in case of systemd
systemd: add back alternatives for init utitilies
udev-extraconf: Skip the entry in /etc/fstab when using the systemd-mount
udev-extraconf: Fix the recursively dependency for the systemd-mount
udev-extraconf: Use the canonical file name of systemd

P.S.
I chose to remove udev-extraconf from these two packagegroups because:
1) udev-extraconf is needed in live image, so the automount rule needs to be there in the final package, regardless of the init manager of the real rootfs.
2) It's not clear whether users need the automount feature in case of systemd. So I didn't choose to modify the mount.sh script to exit directly if init manager is systemd.
3) I think it's not easy to make mount.sh reliable in systemd. Kevin's patches are good and helpful, but still not solve all problems. e.g. The mount.sh still doesn't take into consideration of .mount and .automount units; and it does not consider this failure case, i.e. no medium found on /dev/hdc.

Best Regards,
Chen Qi

[email protected]

2018-10-25 23:02 UTC #4 lore raw

Quoted 32 lines · ChenQi

The failure is revealed by Kevin's patches regarding udev-extraconf. More particularly, it's the following patch that reveals the problem. "udev-extraconf: Use the canonical file name of systemd"
I've sent out a patch to remove udev-extraconf from packagegroup-core-lsb/-x11-sato to fix this failure.
I tested 'testimage + core-image-sato/lsb' with the following 5 patches
(3 from Kevin which are now on master-next, 2 from me) with master branch, and the tests passed.
packagegroup-core-lsb/-x11-sato: no udev-extraconf in case of
systemd
systemd: add back alternatives for init utitilies
udev-extraconf: Skip the entry in /etc/fstab when using the
systemd-mount
udev-extraconf: Fix the recursively dependency for the systemd-
mount
udev-extraconf: Use the canonical file name of systemd
P.S.
I chose to remove udev-extraconf from these two packagegroups because:
1) udev-extraconf is needed in live image, so the automount rule needs
to be there in the final package, regardless of the init manager of the
real rootfs.
2) It's not clear whether users need the automount feature in case of
systemd. So I didn't choose to modify the mount.sh script to exit directly if init manager is systemd.
3) I think it's not easy to make mount.sh reliable in systemd.

Quoted 8 lines

Kevin's
patches are good and helpful, but still not solve all problems. e.g. The
mount.sh still doesn't take into consideration of .mount and .automount
units; and it does not consider this failure case, i.e. no medium found
on /dev/hdc.

Thanks for this, with travelling for ELC-E its been a week of distractions so I appreciate someone looking into and figuring this out!

Cheers,

Richard