>From aed27ce333c74c680280e8c64efbc6b199c55bc0 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 24 Jan 2012 23:58:31 +0200 Subject: [PATCH 1/2] conf.d/live.mk: factor commons into distro/.live-x11 It's rather unexpected that someone would do an X11 LiveCD without user autologin -- but even if that's the case, then this waypoint is just not used for it. --- conf.d/live.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index bc18033..7de9c39 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -6,6 +6,8 @@ distro/rescue: distro/.base use/rescue use/syslinux/ui-menu distro/live: distro/.base use/live/base use/power/acpi/cpufreq distro/live-systemd: distro/.base use/live/base use/systemd +distro/.live-x11: distro/live use/live/autologin use/power/acpi/button + distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum @$(call add,LIVE_PACKAGES,livecd-isomd5sum) @@ -24,11 +26,11 @@ distro/live-builder: distro/.base use/repo/main \ distro/live-install: distro/.base use/live/base use/syslinux/localboot.cfg @$(call add,LIVE_PACKAGES,live-install) -distro/live-icewm: distro/live use/live/autologin +distro/live-icewm: distro/.live-x11 @$(call add,LIVE_LISTS, \ $(call tags,(base || desktop) && (live || network || icewm))) -distro/live-razorqt: distro/live use/live/autologin +distro/live-razorqt: distro/.live-x11 @$(call add,LIVE_LISTS, \ $(call tags,(base || desktop) && (live || network || razorqt))) -- 1.7.8.4