From 70f2a70fcad98e8e6867c28fa034b10e1f38a973 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 7 Mar 2012 14:38:57 +0200 Subject: [PATCH] conf.d/live.mk: autologin rehash If we have a supported display manager, we should rather autoconfigure that one for autologin instead of configuring autologin package: those tend to play better with "modern" session management in terms of runlevel control etc. xdm doesn't really differ though. TODO: maybe skip autologin *package* configuration if any dm found in the live image-script? --- conf.d/live.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index f9160035..8111298b 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -10,8 +10,7 @@ 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/firmware use/live/autologin \ - use/power/acpi/button +distro/.live-x11: distro/live use/firmware use/power/acpi/button distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum @$(call add,LIVE_PACKAGES,livecd-isomd5sum) @@ -31,7 +30,7 @@ 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-x11 +distro/live-icewm: distro/.live-x11 use/live/autologin @$(call add,LIVE_LISTS, \ $(call tags,(base || desktop) && (live || network || icewm))) @@ -44,7 +43,7 @@ distro/live-rescue: distro/live-icewm @$(call add,LIVE_LISTS, \ $(call tags,(base || extra) && (archive || rescue || network))) -distro/live-webkiosk: distro/.live-x11 use/live/hooks +distro/live-webkiosk: distro/.live-x11 use/live/autologin use/live/hooks @$(call add,LIVE_PACKAGES,livecd-webkiosk) @$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)