init: rework de-systemd-ization

It's the very same problem that must be solved within mkimage:
some package lists get expanded early and some late thus having
no chance to influence apt's choices of alternatives made early
(in fact, too early).

Until that, here's another kludge...

PS: turns out that ^systemd- is not "drop ^systemd" but rather:
    systemd-analyze
    systemd-coredump
    systemd-journal-gateway
    systemd-networkd
    systemd-sysvinit
    -- thus one /really/ wants something else.
This commit is contained in:
Michael Shigorin 2015-06-29 17:19:57 +03:00
parent 93c3fbf79b
commit 30d38381a3
2 changed files with 5 additions and 1 deletions

View File

@ -4,13 +4,15 @@
use/init:
@$(call add_feature)
@$(call add,THE_LISTS,$$(INIT_TYPE))
@$(call add,RESCUE_LISTS,$$(INIT_TYPE))
# THE_LISTS is too late when BASE_PACKAGES have pulled in
# the wrong syslogd-daemon provider already
use/init/sysv: use/init
@$(call set,INIT_TYPE,sysvinit)
@$(call add,BASE_PACKAGES,syslogd)
@$(call add,BASE_PACKAGES_REGEXP,^systemd- ^systemd-services-)
@$(call add,BASE_PACKAGES_REGEXP,^systemd-services-)
@$(call add,BASE_PACKAGES_REGEXP,^systemd-networkd-)
use/init/sysv/polkit: use/init/sysv
@$(call add,THE_PACKAGES,polkit-sysvinit)

View File

@ -1,3 +1,5 @@
sysvinit
sysklogd
interactivesystem
systemd-