Skip to content

M
mkimage-profiles
Commit 61ead13d authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

regular.mk: disable plymouth for gnome3-based distros

The issue is that it's suddenly broken in current Sisyphus, looks like the peculiar set of assumptions in fedora-tweaked systemd+plymouth+gdm3 relies on tty1 being the X session tty and it's different here.
parent d9ae9965
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
conf.d/regular.mk
View file @ 61ead13d
...@@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS)) ...@@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.base +live +wireless use/live/ru \ distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
use/live/install use/live/repo use/x11/3d-free use/systemd \ use/live/install use/live/repo use/x11/3d-free use/systemd \
use/firmware/wireless use/efi/signed use/luks +plymouth \ use/firmware/wireless use/efi/signed use/luks \
+vmguest use/memtest use/branding use/syslinux/ui/gfxboot +vmguest use/memtest use/branding use/syslinux/ui/gfxboot
@$(call add,LIVE_LISTS,$(call tags,base regular)) @$(call add,LIVE_LISTS,$(call tags,base regular))
@$(call add,LIVE_LISTS,$(call tags,rescue extra)) @$(call add,LIVE_LISTS,$(call tags,rescue extra))
...@@ -12,7 +12,7 @@ distro/.regular-desktop: distro/.base +live +wireless use/live/ru \ ...@@ -12,7 +12,7 @@ distro/.regular-desktop: distro/.base +live +wireless use/live/ru \
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
@$(call try,SAVE_PROFILE,yes) @$(call try,SAVE_PROFILE,yes)
distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20; @: distro/.regular-gtk: distro/.regular-desktop use/x11/gdm2.20 +plymouth; @:
distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind distro/regular-icewm: distro/.regular-gtk +icewm use/efi/refind
@$(call add,LIVE_PACKAGES,xxkb mutt) @$(call add,LIVE_PACKAGES,xxkb mutt)
...@@ -32,14 +32,15 @@ distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon ...@@ -32,14 +32,15 @@ distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @: distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
distro/regular-tde: distro/.regular-desktop +tde distro/regular-tde: distro/.regular-desktop +tde +plymouth
@$(call add,LIVE_LISTS,$(call tags,desktop nm)) @$(call add,LIVE_LISTS,$(call tags,desktop nm))
@$(call add,LIVE_PACKAGES,kdegames kdeedu) @$(call add,LIVE_PACKAGES,kdegames kdeedu)
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 +plymouth
@$(call add,LIVE_PACKAGES,kde4-regular) @$(call add,LIVE_PACKAGES,kde4-regular)
@$(call add,LIVE_PACKAGES,plasma-applet-networkmanager) @$(call add,LIVE_PACKAGES,plasma-applet-networkmanager)
distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4; @: distro/regular-razorqt: distro/.regular-desktop use/x11/razorqt use/x11/kdm4 \
+plymouth; @:
endif endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment