From 0e72c67e98ab2f8a5e94e6295cac3280fa26fe92 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sat, 12 Apr 2014 19:58:08 +0400 Subject: [PATCH] Revert "regular.mk: use imagewriter" This reverts commit fd8f375573951280d1ae06f2d7dd559fab9caef9. xdg-su is broken (some would say beyond repair) regarding DE detection and handling of various GUI helper utilities, especially in graceful fallback department; only a few images can get imagewriter until this is fixed, let kde4 be the one. --- conf.d/regular.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 20c7b34e..83cd2657 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -29,7 +29,6 @@ distro/.regular-base: distro/.regular-x11 mixin/regular-desktop distro/.regular-desktop: distro/.regular-base \ use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd @$(call add,LIVE_LISTS,domain-client) - @$(call add,LIVE_PACKAGES,imagewriter) @$(call add,THE_BRANDING,bootloader) @$(call set,KFLAVOURS,std-def) @@ -136,6 +135,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \ distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \ use/fonts/zerg +pulse +plymouth +nm @$(call add,LIVE_LISTS,$(call tags,regular kde4)) + @$(call add,LIVE_PACKAGES,rosa-imagewriter) distro/regular-razorqt: distro/.regular-desktop +razorqt +plymouth; @: