diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd_256.7.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_256.7.bb b/meta/recipes-core/systemd/systemd_256.7.bb index 68f15ab065..af810c0fcd 100644 --- a/meta/recipes-core/systemd/systemd_256.7.bb +++ b/meta/recipes-core/systemd/systemd_256.7.bb | |||
| @@ -339,7 +339,7 @@ do_install() { | |||
| 339 | install -d ${D}${systemd_system_unitdir}/rescue.target.wants | 339 | install -d ${D}${systemd_system_unitdir}/rescue.target.wants |
| 340 | 340 | ||
| 341 | # Create symlinks for systemd-update-utmp-runlevel.service | 341 | # Create symlinks for systemd-update-utmp-runlevel.service |
| 342 | if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then | 342 | if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)} && ${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'true', 'false', d)}; then |
| 343 | ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service | 343 | ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service |
| 344 | ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service | 344 | ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service |
| 345 | ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/poweroff.target.wants/systemd-update-utmp-runlevel.service | 345 | ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/poweroff.target.wants/systemd-update-utmp-runlevel.service |
| @@ -841,7 +841,9 @@ python do_warn_musl() { | |||
| 841 | } | 841 | } |
| 842 | addtask warn_musl before do_configure | 842 | addtask warn_musl before do_configure |
| 843 | 843 | ||
| 844 | ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" | 844 | ALTERNATIVE:${PN} = "halt reboot shutdown poweroff \ |
| 845 | ${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'runlevel', '', d)} \ | ||
| 846 | ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" | ||
| 845 | 847 | ||
| 846 | ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" | 848 | ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" |
| 847 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" | 849 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" |
