diff --git a/conf.d/armh.mk b/conf.d/armh.mk index 617bdb2a..a4b6764f 100644 --- a/conf.d/armh.mk +++ b/conf.d/armh.mk @@ -52,7 +52,7 @@ vm/.cubox-base: vm/.cubox-bare use/deflogin/altlinuxroot; @: vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @: vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares \ - use/domain-client + use/domain-client +nm; @: vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin @$(call add,BASE_PACKAGES,livecd-ru) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 704a8f8e..06d45a4d 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -47,17 +47,15 @@ else $(error $@ is known buggy on non-i586 at the moment) endif -distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @: +distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @: -distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality - @$(call add,LIVE_LISTS,$(call tags,desktop nm)) +distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad @$(call add,LIVE_PACKAGES,livecd-regular-xmonad) -distro/regular-mate: distro/.regular-gtk use/x11/mate +distro/regular-mate: distro/.regular-gtk use/x11/mate +nm @$(call add,LIVE_LISTS,$(call tags,mobile mate)) - @$(call add,LIVE_LISTS,$(call tags,desktop nm)) ### +nm? distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality @$(call add,LIVE_PACKAGES,xterm) @@ -68,8 +66,7 @@ distro/regular-cinnamon: distro/.regular-gtk \ distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @: -distro/regular-tde: distro/.regular-desktop +tde +plymouth - @$(call add,LIVE_LISTS,$(call tags,desktop nm)) +distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm @$(call add,LIVE_PACKAGES,kdegames kdeedu) distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \