Skip to content

M
mkimage-profiles
Commit 1e13df84 authored by Dmitriy Terekhin's avatar Dmitriy Terekhin Committed by Anton Midyukov
Browse files
Options

alt-server: Use p11

Revert "Use apt-conf-sisyphus" This reverts commit fa892f1efb45dc0074f0a2d628960fa4c7b9909f.
parent 164f0439
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
conf.d/mixin-alt-server.mk
View file @ 1e13df84
...@@ -19,7 +19,7 @@ mixin/alt-server: +installer +systemd \ ...@@ -19,7 +19,7 @@ mixin/alt-server: +installer +systemd \
use/install2/stage3 \ use/install2/stage3 \
use/install2/vnc use/install2/xfs use/install2/fat \ use/install2/vnc use/install2/xfs use/install2/fat \
use/volumes/alt-server \ use/volumes/alt-server \
use/apt-conf \ use/apt-conf/branch \
use/fonts/install2 \ use/fonts/install2 \
use/l10n/default/ru_RU use/install2/stage3 \ use/l10n/default/ru_RU use/install2/stage3 \
use/firmware/full \ use/firmware/full \
...@@ -27,8 +27,7 @@ mixin/alt-server: +installer +systemd \ ...@@ -27,8 +27,7 @@ mixin/alt-server: +installer +systemd \
use/tty use/tty
@$(call set,INSTALLER,centaurus) @$(call set,INSTALLER,centaurus)
@$(call set,BRANDING,alt-server) @$(call set,BRANDING,alt-server)
# For test on Sisyphus @$(call set,THE_APT_CONF,branch-gostcrypto)
# @$(call set,THE_APT_CONF,branch-gostcrypto)
@$(call set,DISABLE_LANG_MENU,in_grub) @$(call set,DISABLE_LANG_MENU,in_grub)
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,grubpcboot) @$(call set,BOOTLOADER,grubpcboot)
......
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