commit: 48afec3f942e6f2903609204d8cf3497064c5e22
Author: Matt Turner gentoo org>
AuthorDate: Tue Nov 15 02:39:57 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Nov 17 23:41:05 2022 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=48afec3f
catalyst: Drop livecd/{xinitrc,xsession,xdm}
This is functionality better implemented in fsscripts outside of
catalyst.
Signed-off-by: Matt Turner gentoo.org>
catalyst/targets/livecd_stage2.py| 3 --
doc/catalyst-spec.5.txt | 20
examples/livecd-stage2_template.spec | 24 --
examples/stage4_template.spec| 10 --
livecd/files/livecd.motd.txt | 3 --
targets/livecd-stage2/controller.sh | 9 --
targets/stage4/controller.sh | 8 -
targets/support/livecdfs-update.sh | 63 +---
8 files changed, 1 insertion(+), 139 deletions(-)
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index 832e0998..1a798a1e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -39,9 +39,6 @@ class livecd_stage2(StageBase):
"livecd/users",
"livecd/verify",
"livecd/volid",
-"livecd/xdm",
-"livecd/xinitrc",
-"livecd/xsession",
"repos",
])
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 10eb0bb8..fd2926fb 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -389,26 +389,6 @@ This is typically used for adding the documentation,
distfiles,
snapshots, and stages to the official media. These files will not be
available if `docache` is enabled, as they are outside the loop.
-*/xinitrc*::
-This is used by catalyst to copy the specified file to
-`/etc/X11/xinit/xinitrc` and is used by the */type*
-`generic-livecd`. While the file will still be copied for any
-*/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. This setting
-is supported by the `stage4` and `livecd` targets.
-
-*livecd/xdm*::
-This is used by catalyst to determine which display manager you wish
-to become the default (example: `gdm`). This is used on the official
-Gentoo LiveCD and is valid for any `livecd/type`.
-
-*livecd/xsession*::
-This is used by catalyst to determine which X session should be
-started by default by the display manager (example: `gnome`). This is
-used on the official Gentoo LiveCD and is valid for any livecd/type.
-
*/users*::
This option is used to create non-root users on your target. It takes
a space separated list of user names. These users will be added to
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
