Skip to content

M
mkimage-profiles
Commit 2bbfb89e authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

regular.mk: do'nt change INSTALL2_INIT, as this default

parent 033b2c02
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
conf.d/regular.mk
View file @ 2bbfb89e
...@@ -69,9 +69,6 @@ distro/.regular-desktop: distro/.regular-wm use/branding/full \ ...@@ -69,9 +69,6 @@ distro/.regular-desktop: distro/.regular-wm use/branding/full \
use/firmware/laptop +systemd +vmguest \ use/firmware/laptop +systemd +vmguest \
use/live-install/oem use/services/bluetooth-enable \ use/live-install/oem use/services/bluetooth-enable \
use/live/rescue use/live/rescue
ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
@$(call set,INSTALL2_INIT,systemd.unit=install2.target)
endif
@$(call add,THE_PACKAGES,bluez) @$(call add,THE_PACKAGES,bluez)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
...@@ -105,7 +102,6 @@ distro/regular-jeos-sysv: distro/.regular-jeos +sysvinit +power; @: ...@@ -105,7 +102,6 @@ distro/regular-jeos-sysv: distro/.regular-jeos +sysvinit +power; @:
distro/regular-jeos-systemd: distro/.regular-jeos +systemd; @: distro/regular-jeos-systemd: distro/.regular-jeos +systemd; @:
ifeq (,$(filter-out sisyphus p11,$(BRANCH))) ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
@$(call set,INSTALL2_INIT,systemd.unit=install2.target)
@$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,livecd-net-eth)
endif endif
...@@ -203,7 +199,6 @@ distro/.regular-server-full: distro/.regular-server-managed \ ...@@ -203,7 +199,6 @@ distro/.regular-server-full: distro/.regular-server-managed \
distro/regular-server-systemd: distro/.regular-server-full \ distro/regular-server-systemd: distro/.regular-server-full \
+systemd; @: +systemd; @:
ifeq (,$(filter-out sisyphus p11,$(BRANCH))) ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
@$(call set,INSTALL2_INIT,systemd.unit=install2.target)
@$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,livecd-net-eth)
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment