From 6d1f4f6b894ca2583694cd7ce49c8d4826e9dad2 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 13 Nov 2013 17:42:30 +0400 Subject: [PATCH] regular.mk, p7.mk: initial sysvinit tde installer I've been considering a way to avoid confusion between: - a tde based livecd with systemd; - a tde based livecd with sysvinit; - a tde based installer with sysvinit and finally came to conclusion that regular-sysv prefix will be common for installers with sysvinit within regular.mk and p7.mk; this might be not perfect but should be good enough. Note that while regular-sysv-tde.iso is buildable and installs just fine at the moment I don't plan to publish Sisyphus based installer builds as a rule since these require extra knowledge regarding daily use (starting with http://altlinux.org/changes and/or https://lists.altlinux.org/mailman/listinfo/sisyphus ML subscription). Sisyphus-based rescue image is fine as well as LiveCDs are; installable LiveCDs (most of regular-*.iso) are actually risky in case user actually installs *and* updates those having ignored the red "unstable" status in the branding, and that's the line I'm not going to cross that often. --- conf.d/p7.mk | 2 ++ conf.d/regular.mk | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/conf.d/p7.mk b/conf.d/p7.mk index f89cd949..b0ac22e4 100644 --- a/conf.d/p7.mk +++ b/conf.d/p7.mk @@ -20,6 +20,8 @@ distro/altlinux-p7-tde-sysv: distro/regular-tde-sysv mixin/p7; @: distro/altlinux-p7-wmaker: distro/regular-wmaker mixin/p7; @: distro/altlinux-p7-xfce: distro/regular-xfce mixin/p7; @: +distro/altlinux-p7-sysv-tde: distro/regular-sysv-tde mixin/p7; @: + distro/altlinux-p7-server: distro/regular-server mixin/p7; @: endif diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 108d1c4e..f101b852 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -106,6 +106,10 @@ distro/regular-rescue: distro/.regular-bare use/rescue/rw \ @$(call set,KFLAVOURS,un-def) @$(call add,RESCUE_PACKAGES,gpm) +distro/regular-sysv-tde: distro/.regular-install-x11 \ + mixin/desktop-installer mixin/regular-tde use/branding/complete \ + use/net-eth/dhcp use/install2/fs use/efi/refind; @: + distro/regular-server: distro/.regular-install \ use/install2/fs use/bootloader/lilo use/server/mini use/luks @$(call add,THE_LISTS,$(call tags,(base || server) && regular))