aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-11-14 21:39:57 -0500
committerMatt Turner <mattst88@gentoo.org>2022-11-17 18:41:05 -0500
commit48afec3f942e6f2903609204d8cf3497064c5e22 (patch)
treef4fa1cae1d8ff82ac4dc38b6a76870784babc136 /examples
parenttargets: Remove openglify usage (diff)
downloadcatalyst-48afec3f942e6f2903609204d8cf3497064c5e22.tar.gz
catalyst-48afec3f942e6f2903609204d8cf3497064c5e22.tar.bz2
catalyst-48afec3f942e6f2903609204d8cf3497064c5e22.zip
catalyst: Drop livecd/{xinitrc,xsession,xdm}
This is functionality better implemented in fsscripts outside of catalyst. Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/livecd-stage2_template.spec24
-rw-r--r--examples/stage4_template.spec10
2 files changed, 0 insertions, 34 deletions
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 8db17ed7..adf0acaf 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -202,30 +202,6 @@ livecd/overlay:
# livecd/root_overlay:
livecd/root_overlay:
-# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc
-# and is used by the livecd/type and generic-livecd. While the file will still
-# be copied for any livecd/type, catalyst will only create the necessary
-# /etc/startx for those types, so X will not be automatically started. This is
-# useful also for setting up X on a CD where you do not wish X to start
-# automatically. We do not use this on the release media, so it is left blank.
-# example:
-# livecd/xinitrc:
-livecd/xinitrc:
-
-# This is used by catalyst to determine which display manager you wish to
-# become the default. This is used on the official Gentoo LiveCD and is valid
-# for any livecd/type.
-# example:
-# livecd/xdm: gdm
-livecd/xdm:
-
-# This is used by catalyst to determine which X session should be started by
-# default by the display manager. This is used on the official Gentoo LiveCD
-# and is valid for any livecd/type.
-# example:
-# livecd/xsession: gnome
-livecd/xsession:
-
# This option is used to create non-root users on your CD. It takes a space
# separated list of user names. These users will be added to the following
# groups: users,wheel,audio,games,cdrom,usb
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 5d9a390c..a7a3e766 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -161,16 +161,6 @@ stage4/rcdel:
# stage4/root_overlay:
stage4/root_overlay:
-# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc
-# and is used by the stage4/type generic-livecd. While the file will still be
-# copied for any stage4/type, catalyst will only create the necessary
-# /etc/startx for those types, so X will not be automatically started. This is
-# useful also for setting up X on a CD where you do not wish X to start
-# automatically. We do not use this on the release media, so it is left blank.
-# example:
-# stage4/xinitrc:
-stage4/xinitrc:
-
# This option is used to create groups. It takes a carriage-return separated
# list of group names. For instance:
# stage4/groups: