From 30d38381a3d9318c53e96ce97d001da70cd7902e Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 29 Jun 2015 17:19:57 +0300 Subject: [PATCH] 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. --- features.in/init/config.mk | 4 +++- pkg.in/lists/sysvinit | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/features.in/init/config.mk b/features.in/init/config.mk index a001e9f1..91b12029 100644 --- a/features.in/init/config.mk +++ b/features.in/init/config.mk @@ -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) diff --git a/pkg.in/lists/sysvinit b/pkg.in/lists/sysvinit index a8d076c6..83b323a6 100644 --- a/pkg.in/lists/sysvinit +++ b/pkg.in/lists/sysvinit @@ -1,3 +1,5 @@ sysvinit sysklogd interactivesystem + +systemd-