Attachment #263317 for bug #311265

Lines 1091-1097 Link Here

(-)catalyst.orig/modules/generic_stage_target.py (-1 / +1 lines)
1091	if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):	1091	if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):
1092	cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\	1092	cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\
1093	"Could not remove /usr/local/portage",env=self.env)	1093	"Could not remove /usr/local/portage",env=self.env)
1094	cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\	1094	cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
1095	"/etc/make.conf",\	1095	"/etc/make.conf",\
1096	"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)	1096	"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
1097		1097

Lines 23-29 Link Here

(-)catalyst.orig/targets/stage1/stage1-chroot.sh (-2 / +2 lines)
23	[ -e /etc/make.conf ] && \	23	[ -e /etc/make.conf ] && \
24	echo 'USE="${USE} -build"' >> /etc/make.conf	24	echo 'USE="${USE} -build"' >> /etc/make.conf
25	run_merge "--oneshot --nodeps sys-apps/baselayout"	25	run_merge "--oneshot --nodeps sys-apps/baselayout"
26	sed -i '/USE="${USE} -build"/d' /etc/make.conf	26	gsed -i '/USE="${USE} -build"/d' /etc/make.conf
27		27
28	# Next, we install the package manager	28	# Next, we install the package manager
29	clst_root_path=/ setup_pkgmgr	29	clst_root_path=/ setup_pkgmgr
Lines 34-38 Link Here
34	echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \	34	echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \
35	>> /etc/make.conf	35	>> /etc/make.conf
36	run_merge "--oneshot ${clst_buildpkgs}"	36	run_merge "--oneshot ${clst_buildpkgs}"
37	sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \	37	gsed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
38	/etc/make.conf	38	/etc/make.conf

Lines 66-72 Link Here

(-)catalyst.orig/targets/support/bootloader-setup.sh (-1 / +1 lines)
66	echo "message=/boot/boot.msg" >> ${icfg}	66	echo "message=/boot/boot.msg" >> ${icfg}
67		67
68	# Here is where I fix up the boot.msg file.	68	# Here is where I fix up the boot.msg file.
69	sed -e 's/ARCH/PowerPC/' \	69	gsed -e 's/ARCH/PowerPC/' \
70	-e 's/HARDWARE/Apple and IBM hardware/' \	70	-e 's/HARDWARE/Apple and IBM hardware/' \
71	-i $kmsg	71	-i $kmsg
72		72




		else
			clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
		fi
		gsed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
		mkdir -p /etc/distcc
		echo "${clst_distcc_hosts}" > /etc/distcc/hosts
		# We need to run distcc-config, since it might not have gotten run

	# just let emerge system could merge it.
	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
	run_merge --oneshot --nodeps virtual/portage
	gsed -i '/USE="${USE} build"/d' /etc/make.conf
}

cleanup_distcc() {


make_destpath() {
	# ROOT is / by default, so remove any ROOT= settings from make.conf
	gsed -i '/ROOT=/d' /etc/make.conf
	export ROOT=/
	if [ "${1}" != "/" -a -n "${1}" ] 
	then

Lines 189-198 Link Here

(-)catalyst.orig/targets/support/create-iso.sh (-2 / +2 lines)
189	if [ -f ${clst_target_path}/ppc/bootinfo.txt ]	189	if [ -f ${clst_target_path}/ppc/bootinfo.txt ]
190	then	190	then
191	echo "bootinfo.txt found .. updating it"	191	echo "bootinfo.txt found .. updating it"
192	sed -i -e \	192	gsed -i -e \
193	's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \	193	's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \
194	${clst_target_path}/ppc/bootinfo.txt	194	${clst_target_path}/ppc/bootinfo.txt
195	sed -i -e \	195	gsed -i -e \
196	's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \	196	's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
197	${clst_target_path}/ppc/bootinfo.txt	197	${clst_target_path}/ppc/bootinfo.txt
198	fi	198	fi




	if [ ! "${clst_kextraversion}" = "" ]
	then
		echo "Setting extraversion to ${clst_kextraversion}"
		gsed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
		echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
	else 
		touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION

fi

build_kernel
gsed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/make.conf
# grep out the kernel version so that we can do our modules magic
VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | gsed -e "s/EXTRAVERSION =//" -e "s/ //g"`
clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}

/sbin/update-modules --assume-kernel=${clst_fudgeuname}

then
	if [ -e /etc/portage/profile/package.provided ]
	then
		gsed -i "/^$(echo "${KERNELVERSION}" | gsed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
	fi
fi




# Allow root logins to our CD by default
if [ -e /etc/sshd/sshd_config ]
then
	gsed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
		/etc/ssh/sshd_config
fi

# Turn off udev tarball
gsed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc

# Turn off udev coldplugging
gsed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc

# Clean up the time and set to UTC
rm -rf /etc/localtime

# Setup sudoers
if [ -f /etc/sudoers ]
then
	gsed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
fi

# Setup links for ethernet devices

cat /etc/make.conf.old >> /etc/make.conf

# devfs tweaks
[ -e /etc/devfsd.conf ] && gsed -i '/dev-state/ s:^:#:' /etc/devfsd.conf

# Add some helpful aliases
echo "alias cp='cp -i'" >> /etc/profile

# Setup configured display manager
if [ -n "${clst_livecd_xdm}" ]
then
	gsed -i \
		-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
		/etc/rc.conf
	gsed -i \
		-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
		/etc/conf.d/xdm
fi

# Setup configured default X Session
if [ -n "${clst_livecd_xsession}" ]
then
	gsed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \
		/etc/rc.conf
fi


	gentoo-release-universal)
		cat /etc/generic.motd.txt /etc/universal.motd.txt \
			/etc/minimal.motd.txt > /etc/motd
		gsed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
	;;
	gentoo-release-minimal)
		cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
		gsed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
	;;
	gentoo-release-live*)
		cat /etc/generic.motd.txt \
			/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
		gsed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
			-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
	;;
	gentoo-gamecd)
		cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
		gsed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
	;;
esac


then
	if [ -d /etc/splash/${clst_livecd_splash_theme} ]
	then
		gsed -i \
			-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
			-e "/^# SPLASH_TTYS=/ s/^#//" \
			/etc/conf.d/splash

			rm /tmp/gamecd.conf

			# Here we replace out game information into several files
			gsed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd

			# Here we setup our xinitrc
			echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc

					/etc/X11/gdm/custom.conf
			else
				cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
				gsed -i \
					-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
					-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
					-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \


				if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
				then
					gsed -i \
						-e "s:TimedLogin=:TimedLogin=${first_user}:" \
						/etc/X11/gdm/gdm.conf
				fi

		# This gives us our list of system packages for the installer
		mkdir -p /usr/livecd
		### XXX: Andrew says we don't need this anymore
		USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | gsed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt

		# This is my hack to reduce tmpfs usage
		cp -r /usr/portage/profiles /usr/livecd

						/home/${username}/Desktop
					cp -f /usr/share/applications/installer-dialog.desktop \
						/home/${username}/Desktop
					gsed -i -e \
						's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
						/home/${username}/Desktop/installer-dialog.desktop
					gsed -i -e 's:Exec=installer-gtk:Exec=installer:' \
						/home/${username}/Desktop/installer-gtk.desktop
				fi
				chown -R ${username}:100 /home/${username}

# We want the first user to be used when auto-starting X
if [ -e /etc/startx ]
then
	gsed -i \
		"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
		/root/.bashrc
fi

if [ -e /lib/rcscripts/addons/udev-start.sh ]
then
	gsed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
fi

Return to bug 311265

Lines 83-89 Link Here

(-)catalyst.orig/targets/support/chroot-functions.sh (-3 / +3 lines)
83	else	83	else
84	clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc \|\| exit 1	84	clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc \|\| exit 1
85	fi	85	fi
86	sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf	86	gsed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
87	mkdir -p /etc/distcc	87	mkdir -p /etc/distcc
88	echo "${clst_distcc_hosts}" > /etc/distcc/hosts	88	echo "${clst_distcc_hosts}" > /etc/distcc/hosts
89	# We need to run distcc-config, since it might not have gotten run	89	# We need to run distcc-config, since it might not have gotten run
Lines 168-174 Link Here
168	# just let emerge system could merge it.	168	# just let emerge system could merge it.
169	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf	169	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
170	run_merge --oneshot --nodeps virtual/portage	170	run_merge --oneshot --nodeps virtual/portage
171	sed -i '/USE="${USE} build"/d' /etc/make.conf	171	gsed -i '/USE="${USE} build"/d' /etc/make.conf
172	}	172	}
173		173
174	cleanup_distcc() {	174	cleanup_distcc() {
Lines 234-240 Link Here
234		234
235	make_destpath() {	235	make_destpath() {
236	# ROOT is / by default, so remove any ROOT= settings from make.conf	236	# ROOT is / by default, so remove any ROOT= settings from make.conf
237	sed -i '/ROOT=/d' /etc/make.conf	237	gsed -i '/ROOT=/d' /etc/make.conf
238	export ROOT=/	238	export ROOT=/
239	if [ "${1}" != "/" -a -n "${1}" ]	239	if [ "${1}" != "/" -a -n "${1}" ]
240	then	240	then

Lines 224-230 Link Here

(-)catalyst.orig/targets/support/kmerge.sh (-4 / +4 lines)
224	if [ ! "${clst_kextraversion}" = "" ]	224	if [ ! "${clst_kextraversion}" = "" ]
225	then	225	then
226	echo "Setting extraversion to ${clst_kextraversion}"	226	echo "Setting extraversion to ${clst_kextraversion}"
227	sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile	227	gsed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
228	echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION	228	echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
229	else	229	else
230	touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION	230	touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
Lines 232-243 Link Here
232	fi	232	fi
233		233
234	build_kernel	234	build_kernel
235	sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/make.conf	235	gsed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/make.conf
236	# grep out the kernel version so that we can do our modules magic	236	# grep out the kernel version so that we can do our modules magic
237	VER=`grep ^VERSION\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`	237	VER=`grep ^VERSION\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`
238	PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`	238	PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`
239	SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`	239	SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`
240	EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile \| sed -e "s/EXTRAVERSION =//" -e "s/ //g"`	240	EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile \| gsed -e "s/EXTRAVERSION =//" -e "s/ //g"`
241	clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}	241	clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
242		242
243	/sbin/update-modules --assume-kernel=${clst_fudgeuname}	243	/sbin/update-modules --assume-kernel=${clst_fudgeuname}
Lines 250-255 Link Here
250	then	250	then
251	if [ -e /etc/portage/profile/package.provided ]	251	if [ -e /etc/portage/profile/package.provided ]
252	then	252	then
253	sed -i "/^$(echo "${KERNELVERSION}" \| sed -e 's\|/\|\\/\|g')\$/d" /etc/portage/profile/package.provided	253	gsed -i "/^$(echo "${KERNELVERSION}" \| gsed -e 's\|/\|\\/\|g')\$/d" /etc/portage/profile/package.provided
254	fi	254	fi
255	fi	255	fi

Lines 7-21 Link Here

(-)catalyst.orig/targets/support/livecdfs-update.sh (-21 / +21 lines)
7	# Allow root logins to our CD by default	7	# Allow root logins to our CD by default
8	if [ -e /etc/sshd/sshd_config ]	8	if [ -e /etc/sshd/sshd_config ]
9	then	9	then
10	sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \	10	gsed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
11	/etc/ssh/sshd_config	11	/etc/ssh/sshd_config
12	fi	12	fi
13		13
14	# Turn off udev tarball	14	# Turn off udev tarball
15	sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc	15	gsed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
16		16
17	# Turn off udev coldplugging	17	# Turn off udev coldplugging
18	sed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc	18	gsed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
19		19
20	# Clean up the time and set to UTC	20	# Clean up the time and set to UTC
21	rm -rf /etc/localtime	21	rm -rf /etc/localtime
Lines 79-85 Link Here
79	# Setup sudoers	79	# Setup sudoers
80	if [ -f /etc/sudoers ]	80	if [ -f /etc/sudoers ]
81	then	81	then
82	sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers	82	gsed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
83	fi	83	fi
84		84
85	# Setup links for ethernet devices	85	# Setup links for ethernet devices
Lines 120-126 Link Here
120	cat /etc/make.conf.old >> /etc/make.conf	120	cat /etc/make.conf.old >> /etc/make.conf
121		121
122	# devfs tweaks	122	# devfs tweaks
123	[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf	123	[ -e /etc/devfsd.conf ] && gsed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
124		124
125	# Add some helpful aliases	125	# Add some helpful aliases
126	echo "alias cp='cp -i'" >> /etc/profile	126	echo "alias cp='cp -i'" >> /etc/profile
Lines 160-169 Link Here
160	# Setup configured display manager	160	# Setup configured display manager
161	if [ -n "${clst_livecd_xdm}" ]	161	if [ -n "${clst_livecd_xdm}" ]
162	then	162	then
163	sed -i \	163	gsed -i \
164	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \	164	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
165	/etc/rc.conf	165	/etc/rc.conf
166	sed -i \	166	gsed -i \
167	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \	167	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
168	/etc/conf.d/xdm	168	/etc/conf.d/xdm
169	fi	169	fi
Lines 171-177 Link Here
171	# Setup configured default X Session	171	# Setup configured default X Session
172	if [ -n "${clst_livecd_xsession}" ]	172	if [ -n "${clst_livecd_xsession}" ]
173	then	173	then
174	sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \	174	gsed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \
175	/etc/rc.conf	175	/etc/rc.conf
176	fi	176	fi
177		177
Lines 183-203 Link Here
183	gentoo-release-universal)	183	gentoo-release-universal)
184	cat /etc/generic.motd.txt /etc/universal.motd.txt \	184	cat /etc/generic.motd.txt /etc/universal.motd.txt \
185	/etc/minimal.motd.txt > /etc/motd	185	/etc/minimal.motd.txt > /etc/motd
186	sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd	186	gsed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
187	;;	187	;;
188	gentoo-release-minimal)	188	gentoo-release-minimal)
189	cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd	189	cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
190	sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd	190	gsed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
191	;;	191	;;
192	gentoo-release-live*)	192	gentoo-release-live*)
193	cat /etc/generic.motd.txt \	193	cat /etc/generic.motd.txt \
194	/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd	194	/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
195	sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \	195	gsed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
196	-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd	196	-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
197	;;	197	;;
198	gentoo-gamecd)	198	gentoo-gamecd)
199	cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd	199	cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
200	sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd	200	gsed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
201	;;	201	;;
202	esac	202	esac
203		203
Lines 208-214 Link Here
208	then	208	then
209	if [ -d /etc/splash/${clst_livecd_splash_theme} ]	209	if [ -d /etc/splash/${clst_livecd_splash_theme} ]
210	then	210	then
211	sed -i \	211	gsed -i \
212	-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \	212	-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
213	-e "/^# SPLASH_TTYS=/ s/^#//" \	213	-e "/^# SPLASH_TTYS=/ s/^#//" \
214	/etc/conf.d/splash	214	/etc/conf.d/splash
Lines 248-254 Link Here
248	rm /tmp/gamecd.conf	248	rm /tmp/gamecd.conf
249		249
250	# Here we replace out game information into several files	250	# Here we replace out game information into several files
251	sed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd	251	gsed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd
252		252
253	# Here we setup our xinitrc	253	# Here we setup our xinitrc
254	echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc	254	echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc
Lines 295-301 Link Here
295	/etc/X11/gdm/custom.conf	295	/etc/X11/gdm/custom.conf
296	else	296	else
297	cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old	297	cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
298	sed -i \	298	gsed -i \
299	-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \	299	-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
300	-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \	300	-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
301	-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \	301	-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \
Lines 305-311 Link Here
305		305
306	if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]	306	if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
307	then	307	then
308	sed -i \	308	gsed -i \
309	-e "s:TimedLogin=:TimedLogin=${first_user}:" \	309	-e "s:TimedLogin=:TimedLogin=${first_user}:" \
310	/etc/X11/gdm/gdm.conf	310	/etc/X11/gdm/gdm.conf
311	fi	311	fi
Lines 315-321 Link Here
315	# This gives us our list of system packages for the installer	315	# This gives us our list of system packages for the installer
316	mkdir -p /usr/livecd	316	mkdir -p /usr/livecd
317	### XXX: Andrew says we don't need this anymore	317	### XXX: Andrew says we don't need this anymore
318	USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system \| grep -e '^\[ebuild' \| sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt	318	USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system \| grep -e '^\[ebuild' \| gsed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
319		319
320	# This is my hack to reduce tmpfs usage	320	# This is my hack to reduce tmpfs usage
321	cp -r /usr/portage/profiles /usr/livecd	321	cp -r /usr/portage/profiles /usr/livecd
Lines 350-359 Link Here
350	/home/${username}/Desktop	350	/home/${username}/Desktop
351	cp -f /usr/share/applications/installer-dialog.desktop \	351	cp -f /usr/share/applications/installer-dialog.desktop \
352	/home/${username}/Desktop	352	/home/${username}/Desktop
353	sed -i -e \	353	gsed -i -e \
354	's:Exec=installer-dialog:Exec=sudo installer-dialog:' \	354	's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
355	/home/${username}/Desktop/installer-dialog.desktop	355	/home/${username}/Desktop/installer-dialog.desktop
356	sed -i -e 's:Exec=installer-gtk:Exec=installer:' \	356	gsed -i -e 's:Exec=installer-gtk:Exec=installer:' \
357	/home/${username}/Desktop/installer-gtk.desktop	357	/home/${username}/Desktop/installer-gtk.desktop
358	fi	358	fi
359	chown -R ${username}:100 /home/${username}	359	chown -R ${username}:100 /home/${username}
Lines 388-399 Link Here
388	# We want the first user to be used when auto-starting X	388	# We want the first user to be used when auto-starting X
389	if [ -e /etc/startx ]	389	if [ -e /etc/startx ]
390	then	390	then
391	sed -i \	391	gsed -i \
392	"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \	392	"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
393	/root/.bashrc	393	/root/.bashrc
394	fi	394	fi
395		395
396	if [ -e /lib/rcscripts/addons/udev-start.sh ]	396	if [ -e /lib/rcscripts/addons/udev-start.sh ]
397	then	397	then
398	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh	398	gsed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
399	fi	399	fi