1 |
This is functionality better implemented in fsscripts outside of |
2 |
catalyst. |
3 |
|
4 |
Signed-off-by: Matt Turner <mattst88@g.o> |
5 |
--- |
6 |
catalyst/targets/livecd_stage2.py | 3 -- |
7 |
doc/catalyst-spec.5.txt | 20 --------- |
8 |
examples/livecd-stage2_template.spec | 24 ----------- |
9 |
examples/stage4_template.spec | 10 ----- |
10 |
livecd/files/livecd.motd.txt | 3 -- |
11 |
targets/livecd-stage2/controller.sh | 9 ---- |
12 |
targets/stage4/controller.sh | 8 ---- |
13 |
targets/support/livecdfs-update.sh | 63 +--------------------------- |
14 |
8 files changed, 1 insertion(+), 139 deletions(-) |
15 |
|
16 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
17 |
index 832e0998..1a798a1e 100644 |
18 |
--- a/catalyst/targets/livecd_stage2.py |
19 |
+++ b/catalyst/targets/livecd_stage2.py |
20 |
@@ -39,9 +39,6 @@ class livecd_stage2(StageBase): |
21 |
"livecd/users", |
22 |
"livecd/verify", |
23 |
"livecd/volid", |
24 |
- "livecd/xdm", |
25 |
- "livecd/xinitrc", |
26 |
- "livecd/xsession", |
27 |
"repos", |
28 |
]) |
29 |
|
30 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
31 |
index f6251597..1abf9efb 100644 |
32 |
--- a/doc/catalyst-spec.5.txt |
33 |
+++ b/doc/catalyst-spec.5.txt |
34 |
@@ -395,26 +395,6 @@ This is typically used for adding the documentation, distfiles, |
35 |
snapshots, and stages to the official media. These files will not be |
36 |
available if `docache` is enabled, as they are outside the loop. |
37 |
|
38 |
-*<target>/xinitrc*:: |
39 |
-This is used by catalyst to copy the specified file to |
40 |
-`/etc/X11/xinit/xinitrc` and is used by the *<target>/type* |
41 |
-`generic-livecd`. While the file will still be copied for any |
42 |
-*<target>/type*, catalyst will only create the necessary `/etc/startx` |
43 |
-for those types, so X will not be automatically started. This is |
44 |
-useful also for setting up X on a CD where you do not wish X to start |
45 |
-automatically. We do not use this on the release media. This setting |
46 |
-is supported by the `stage4` and `livecd` targets. |
47 |
- |
48 |
-*livecd/xdm*:: |
49 |
-This is used by catalyst to determine which display manager you wish |
50 |
-to become the default (example: `gdm`). This is used on the official |
51 |
-Gentoo LiveCD and is valid for any `livecd/type`. |
52 |
- |
53 |
-*livecd/xsession*:: |
54 |
-This is used by catalyst to determine which X session should be |
55 |
-started by default by the display manager (example: `gnome`). This is |
56 |
-used on the official Gentoo LiveCD and is valid for any livecd/type. |
57 |
- |
58 |
*<target>/users*:: |
59 |
This option is used to create non-root users on your target. It takes |
60 |
a space separated list of user names. These users will be added to |
61 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
62 |
index 8e179b73..efbc6d82 100644 |
63 |
--- a/examples/livecd-stage2_template.spec |
64 |
+++ b/examples/livecd-stage2_template.spec |
65 |
@@ -202,30 +202,6 @@ livecd/overlay: |
66 |
# livecd/root_overlay: |
67 |
livecd/root_overlay: |
68 |
|
69 |
-# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc |
70 |
-# and is used by the livecd/type and generic-livecd. While the file will still |
71 |
-# be copied for any livecd/type, catalyst will only create the necessary |
72 |
-# /etc/startx for those types, so X will not be automatically started. This is |
73 |
-# useful also for setting up X on a CD where you do not wish X to start |
74 |
-# automatically. We do not use this on the release media, so it is left blank. |
75 |
-# example: |
76 |
-# livecd/xinitrc: |
77 |
-livecd/xinitrc: |
78 |
- |
79 |
-# This is used by catalyst to determine which display manager you wish to |
80 |
-# become the default. This is used on the official Gentoo LiveCD and is valid |
81 |
-# for any livecd/type. |
82 |
-# example: |
83 |
-# livecd/xdm: gdm |
84 |
-livecd/xdm: |
85 |
- |
86 |
-# This is used by catalyst to determine which X session should be started by |
87 |
-# default by the display manager. This is used on the official Gentoo LiveCD |
88 |
-# and is valid for any livecd/type. |
89 |
-# example: |
90 |
-# livecd/xsession: gnome |
91 |
-livecd/xsession: |
92 |
- |
93 |
# This option is used to create non-root users on your CD. It takes a space |
94 |
# separated list of user names. These users will be added to the following |
95 |
# groups: users,wheel,audio,games,cdrom,usb |
96 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
97 |
index 5d9a390c..a7a3e766 100644 |
98 |
--- a/examples/stage4_template.spec |
99 |
+++ b/examples/stage4_template.spec |
100 |
@@ -161,16 +161,6 @@ stage4/rcdel: |
101 |
# stage4/root_overlay: |
102 |
stage4/root_overlay: |
103 |
|
104 |
-# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc |
105 |
-# and is used by the stage4/type generic-livecd. While the file will still be |
106 |
-# copied for any stage4/type, catalyst will only create the necessary |
107 |
-# /etc/startx for those types, so X will not be automatically started. This is |
108 |
-# useful also for setting up X on a CD where you do not wish X to start |
109 |
-# automatically. We do not use this on the release media, so it is left blank. |
110 |
-# example: |
111 |
-# stage4/xinitrc: |
112 |
-stage4/xinitrc: |
113 |
- |
114 |
# This option is used to create groups. It takes a carriage-return separated |
115 |
# list of group names. For instance: |
116 |
# stage4/groups: |
117 |
diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt |
118 |
index 9f8e2396..a37f53cb 100644 |
119 |
--- a/livecd/files/livecd.motd.txt |
120 |
+++ b/livecd/files/livecd.motd.txt |
121 |
@@ -1,6 +1,3 @@ |
122 |
-To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below. |
123 |
-There is also a rescue session for X using twm if you simply use "startx". |
124 |
- |
125 |
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include |
126 |
detailed information about how to reproduce the bug you are reporting. |
127 |
|
128 |
diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh |
129 |
index 826dc9dc..2b8858c0 100755 |
130 |
--- a/targets/livecd-stage2/controller.sh |
131 |
+++ b/targets/livecd-stage2/controller.sh |
132 |
@@ -52,15 +52,6 @@ case $1 in |
133 |
livecd-update) |
134 |
# Now, finalize and tweak the livecd fs (inside of the chroot) |
135 |
exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh |
136 |
- |
137 |
- # Move over the xinitrc (if applicable) |
138 |
- # This is moved here, so we can override any default xinitrc |
139 |
- if [ -n "${clst_livecd_xinitrc}" ] |
140 |
- then |
141 |
- mkdir -p ${clst_chroot_path}/etc/X11/xinit |
142 |
- cp -f ${clst_livecd_xinitrc} \ |
143 |
- ${clst_chroot_path}/etc/X11/xinit/xinitrc |
144 |
- fi |
145 |
;; |
146 |
|
147 |
rc-update) |
148 |
diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh |
149 |
index 0c40145e..9c1866e4 100755 |
150 |
--- a/targets/stage4/controller.sh |
151 |
+++ b/targets/stage4/controller.sh |
152 |
@@ -42,14 +42,6 @@ case $1 in |
153 |
livecd-update) |
154 |
# Now, finalize and tweak the livecd fs (inside of the chroot) |
155 |
exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh |
156 |
- |
157 |
- # Move over the xinitrc (if applicable) |
158 |
- # This is moved here, so we can override any default xinitrc |
159 |
- if [ -n "${clst_livecd_xinitrc}" ] |
160 |
- then |
161 |
- cp -f ${clst_livecd_xinitrc} \ |
162 |
- ${clst_chroot_path}/etc/X11/xinit/xinitrc |
163 |
- fi |
164 |
;; |
165 |
|
166 |
bootloader) |
167 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
168 |
index 64a9e4b2..e750e785 100755 |
169 |
--- a/targets/support/livecdfs-update.sh |
170 |
+++ b/targets/support/livecdfs-update.sh |
171 |
@@ -51,12 +51,6 @@ then |
172 |
useradd -G users,wheel,audio,plugdev,games,cdrom,disk,floppy,usb \ |
173 |
-g 100 -c "${user_comment}" -m ${x} |
174 |
chown -R ${x}:users /home/${x} |
175 |
- if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ] |
176 |
- then |
177 |
- echo "[Desktop]" > /home/${x}/.dmrc |
178 |
- echo "Session=${clst_livecd_xsession}" >> /home/${x}/.dmrc |
179 |
- chown -R ${x}:users /home/${x} |
180 |
- fi |
181 |
done |
182 |
fi |
183 |
|
184 |
@@ -131,23 +125,6 @@ then |
185 |
http://www.linux-usb.org/usb.ids |
186 |
fi |
187 |
|
188 |
-# Setup configured display manager |
189 |
-if [ -n "${clst_livecd_xdm}" ] |
190 |
-then |
191 |
- sed -i \ |
192 |
- -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ |
193 |
- /etc/rc.conf |
194 |
- sed -i \ |
195 |
- -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ |
196 |
- /etc/conf.d/xdm |
197 |
-fi |
198 |
- |
199 |
-# Setup configured default X Session |
200 |
-if [ -n "${clst_livecd_xsession}" ] |
201 |
-then |
202 |
- echo "XSESSION=\"${clst_livecd_xsession}\"" > /etc/env.d/90xsession |
203 |
-fi |
204 |
- |
205 |
# touch /etc/asound.state |
206 |
touch /etc/asound.state |
207 |
|
208 |
@@ -165,8 +142,7 @@ case ${clst_livecd_type} in |
209 |
gentoo-release-live*) |
210 |
cat /etc/generic.motd.txt \ |
211 |
/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd |
212 |
- sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \ |
213 |
- -e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd |
214 |
+ sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd |
215 |
;; |
216 |
esac |
217 |
|
218 |
@@ -175,43 +151,6 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l |
219 |
# Post configuration |
220 |
case ${clst_livecd_type} in |
221 |
gentoo-release-live*) |
222 |
- # Setup GDM |
223 |
- if [ "${clst_livecd_xdm}" == "gdm" ] |
224 |
- then |
225 |
- if [ ! -e /etc/X11/gdm/gdm.conf ] && [ -e /usr/share/gdm/defaults.conf ] |
226 |
- then |
227 |
- if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ] |
228 |
- then |
229 |
- sedxtra="\nTimedLogin=${first_user}" |
230 |
- else |
231 |
- sedxtra="" |
232 |
- fi |
233 |
- |
234 |
- cp -f /etc/X11/gdm/custom.conf /etc/X11/gdm/custom.conf.old |
235 |
- |
236 |
- sed -i \ |
237 |
- -e "s:\(\[daemon\]\)$:\1\nTimedLoginEnable=true\nTimedLoginDelay=10${sedxtra}:" \ |
238 |
- -e 's:\(\[greeter\]\)$:\1\nGraphicalTheme=gentoo-emergence:' \ |
239 |
- /etc/X11/gdm/custom.conf |
240 |
- else |
241 |
- cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old |
242 |
- sed -i \ |
243 |
- -e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \ |
244 |
- -e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \ |
245 |
- -e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \ |
246 |
- -e ':^#GraphicalTheme=: s:^#::' \ |
247 |
- -e 's:^GraphicalTheme=.*$:GraphicalTheme=gentoo-emergence:' \ |
248 |
- /etc/X11/gdm/gdm.conf |
249 |
- |
250 |
- if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ] |
251 |
- then |
252 |
- sed -i \ |
253 |
- -e "s:TimedLogin=:TimedLogin=${first_user}:" \ |
254 |
- /etc/X11/gdm/gdm.conf |
255 |
- fi |
256 |
- fi |
257 |
- fi |
258 |
- |
259 |
# This is my hack to reduce tmpfs usage |
260 |
mkdir -p /usr/livecd |
261 |
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd |
262 |
-- |
263 |
2.37.4 |