@@ -29,11 +29,16 @@ python __anonymous() {
}
systemd_postinst() {
-if systemctl >/dev/null 2>/dev/null; then
+if type systemctl >/dev/null 2>/dev/null; then
OPTS=""
if [ -n "$D" ]; then
- OPTS="--root=$D"
+ # Use ${STAGING_LIBDIR_NATIVE}/systemd rather than
+ # ${STAGING_DIR_NATIVE}${systemd_unitdir} because the latter is
+ # affected by whether the usrmerge distro feature is set _for
+ # target_, and we need to know the path to systemd-sysv-install
+ # where it was installed _for native_.
+ OPTS="--root=$D --sysv-install=${STAGING_LIBDIR_NATIVE}/systemd/systemd-sysv-install"
fi
if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
@@ -46,7 +51,7 @@ if systemctl >/dev/null 2>/dev/null; then
done
fi
- if [ -z "$D" ]; then
+ if [ -z "$D" ] && systemctl >/dev/null 2>/dev/null; then
# Reload only system service manager
# --global for daemon-reload is not supported: https://github.com/systemd/systemd/issues/19284
systemctl daemon-reload
@@ -66,8 +71,8 @@ fi
}
systemd_prerm() {
-if systemctl >/dev/null 2>/dev/null; then
- if [ -z "$D" ]; then
+if type systemctl >/dev/null 2>/dev/null; then
+ if [ -z "$D" ] && systemctl >/dev/null 2>/dev/null; then
if [ -n "${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}" ]; then
systemctl stop ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}
systemctl disable ${@systemd_filter_services("${SYSTEMD_SERVICE_ESCAPED}", False, d)}
After the switch from using a systemctl written in Python to using the official version of systemctl from the systemd project, the systemd_postinst function has effectively not been executed during the rootfs creation. The reason is that systemctl provided by systemctl-native fails if run without argument (as systemd_postinst does): Failed to connect to system scope bus via local transport: Operation not permitted (consider using --machine=<user>@.host --user to connect to bus of other user) This is not seen in the logs since stderr is sent to /dev/null, and the only way to tell that there is a problem is because systemd services that are expected to be enabled aren't running. The reason this has gone unnoticed is because systemd_handle_machine_id in rootfs-postcommands.bbclass will call systemctl preset-all, which in most cases will create the missing links to enable the systemd services. This change effectively reverts commit a52e66762c0c51918b1ba3d4622759637b6e920a (systemd.bbclass: update command to check systemctl available) and instead only runs systemctl without arguments (to determine that it can communicate with systemd) when executed on target. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- PATCHv2: Add --sysv-install= to $OPTS to instruct systemctl where to look for systemd-sysv-install. PATCHv3: No changes. meta/classes-recipe/systemd.bbclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)