Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 108382 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/lib/catalyst/livecd/runscript/x86-archscript.sh (-15 / +2 lines)
Lines 99-121 Link Here
99
			
99
			
100
			if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ]
100
			if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ]
101
			then
101
			then
102
				K_CMD_LINE="  append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet"
102
				echo "  append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
103
			else
103
			else
104
				K_CMD_LINE="  append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent"
104
				echo "  append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg}
105
			fi
105
			fi
106
107
			# Make sure that only the first argument is
108
			# appended to the kernel command line
109
			FINAL_K_CMD_LINE=""
110
			for xyz in $K_CMD_LINE
111
			do
112
				OPT=`echo $xyz | awk -F = '{print $1}'`
113
				if ! `echo $FINAL_K_CMD_LINE | grep -q $OPT`
114
				then
115
					FINAL_K_CMD_LINE="$FINAL_K_CMD_LINE $xyz"
116
				fi
117
			done
118
			echo "$FINAL_K_CMD_LINE" >> ${icfg}
119
			
106
			
120
			echo >> ${icfg}
107
			echo >> ${icfg}
121
			echo "   ${x}" >> ${kmsg}
108
			echo "   ${x}" >> ${kmsg}

Return to bug 108382