keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

p9.mk, regular.mk: added regular and starterkit jeos-systemd

Browse Source 
Also added explicit call +sysvinit or +systemd for server targets.
Users also want to start the server on systemd.
in addition to on aarch64 in qemu, the shell does not start on the
serial console for sysvinit. This is critical for non-desktop builds.
This commit is contained in:
Anton Midyukov 2019-11-04 22:02:36 +07:00
parent 7b817a260d
commit e979da9941
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/p9.mk
View File

@ -16,7 +16,7 @@ distro/alt-p9-cinnamon distro/alt-p9-enlightenment \
distro/alt-p9-xfce-sysv distro/alt-p9-xfce-sysv-install: \ distro/alt-p9-xfce-sysv distro/alt-p9-xfce-sysv-install: \
distro/alt-p9-%: distro/regular-% mixin/p9; @: distro/alt-p9-%: distro/regular-% mixin/p9; @:
distro/alt-p9-jeos-sysv distro/alt-p9-jeos-ovz \ distro/alt-p9-jeos-sysv distro/alt-p9-jeos-ovz distro/alt-p9-server-systemd \
distro/alt-p9-server-sysv distro/alt-p9-server-ovz \ distro/alt-p9-server-sysv distro/alt-p9-server-ovz \
distro/alt-p9-server-hyperv distro/alt-p9-server-samba4 \ distro/alt-p9-server-hyperv distro/alt-p9-server-samba4 \
distro/alt-p9-server-pve distro/alt-p9-server-lxd: \ distro/alt-p9-server-pve distro/alt-p9-server-lxd: \

18
conf.d/regular.mk
View File

@ -184,8 +184,6 @@ distro/.regular-server-base: distro/.regular-install \
@$(call add,SYSTEM_PACKAGES,multipath-tools) @$(call add,SYSTEM_PACKAGES,multipath-tools)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath) @$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
distro/.regular-server-systemd: distro/.regular-server-base +systemd; @:
distro/.regular-server: distro/.regular-server-base \ distro/.regular-server: distro/.regular-server-base \
use/server/mini use/firmware/qlogic use/rescue/base \ use/server/mini use/firmware/qlogic use/rescue/base \
use/ntp/client use/cleanup/libs use/ntp/client use/cleanup/libs
@ -200,22 +198,28 @@ distro/.regular-server-managed: distro/.regular-server
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord) @$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
distro/regular-server-sysv: distro/.regular-server-managed \ distro/.regular-server-full: distro/.regular-server-managed \
use/server/groups/base use/dev/groups/builder use/install2/vnc/full use/server/groups/base use/dev/groups/builder use/install2/vnc/full
@$(call add,MAIN_GROUPS,server/sambaDC) @$(call add,MAIN_GROUPS,server/sambaDC)
@$(call add,MAIN_GROUPS,tools/hyperv) @$(call add,MAIN_GROUPS,tools/hyperv)
distro/regular-server-ovz: distro/.regular-server \ distro/regular-server-systemd: distro/.regular-server-full +systemd; @:
distro/regular-server-sysv: distro/.regular-server-full +sysvinit; @:
distro/.regular-server-ovz: distro/.regular-server \
use/server/ovz use/server/groups/tools use/cleanup/x11-alterator use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
@$(call add,MAIN_GROUPS,tools/vzstats) @$(call add,MAIN_GROUPS,tools/vzstats)
distro/regular-server-hyperv: distro/.regular-server-managed distro/regular-server-ovz: distro/.regular-server-ovz +systemd; @:
distro/regular-server-ovz-sysv: distro/.regular-server-ovz +sysvinit; @:
distro/.regular-server-hyperv: distro/.regular-server-managed +systemd
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
@$(call add,THE_PACKAGES,hyperv-daemons) @$(call add,THE_PACKAGES,hyperv-daemons)
@$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd) @$(call add,DEFAULT_SERVICES_DISABLE,bridge smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop) @$(call add,DEFAULT_SERVICES_DISABLE,cpufreq-simple powertop)
distro/regular-server-pve: distro/.regular-server-systemd \ distro/regular-server-pve: distro/.regular-server-base +systemd \
use/kernel/server use/firmware/qlogic +efi use/kernel/server use/firmware/qlogic +efi
@$(call set,BASE_BOOTLOADER,grub) @$(call set,BASE_BOOTLOADER,grub)
@$(call set,INSTALLER,altlinux-server) @$(call set,INSTALLER,altlinux-server)
@ -232,7 +236,7 @@ distro/regular-builder: distro/.regular-bare mixin/regular-builder \
use/isohybrid use/syslinux/timeout/30 use/stage2/net-eth use/isohybrid use/syslinux/timeout/30 use/stage2/net-eth
@$(call add,THE_PACKAGES,ccache cifs-utils wodim) @$(call add,THE_PACKAGES,ccache cifs-utils wodim)
distro/regular-server-samba4: distro/.regular-server-managed distro/regular-server-samba4: distro/.regular-server-managed +systemd
@$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator))) @$(call add,THE_LISTS,$(call tags,server && (sambaDC || alterator)))
@$(call add,THE_PACKAGES,alterator-dhcp) @$(call add,THE_PACKAGES,alterator-dhcp)
@$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind) @$(call add,DEFAULT_SERVICES_DISABLE,smbd nmbd winbind)