--- /usr/lib/catalyst/livecd/runscript/x86-archscript.sh.orig 2005-10-07 15:15:10.000000000 +0200 +++ /usr/lib/catalyst/livecd/runscript/x86-archscript.sh 2005-10-07 15:22:54.000000000 +0200 @@ -99,10 +99,23 @@ if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] then - 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} + 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" else - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg} + K_CMD_LINE=" append initrd=${x}.igz root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" fi + + # Make sure that only the first argument is + # appended to the kernel command line + FINAL_K_CMD_LINE="" + for xyz in $K_CMD_LINE + do + OPT=`echo $xyz | awk -F = '{print $1}'` + if ! `echo $FINAL_K_CMD_LINE | grep -q $OPT` + then + FINAL_K_CMD_LINE="$FINAL_K_CMD_LINE $xyz" + fi + done + echo "$FINAL_K_CMD_LINE" >> ${icfg} echo >> ${icfg} echo " ${x}" >> ${kmsg}