From: John P. Davis Date: Tue, 19 Oct 2004 03:39:36 +0000 (+0000) Subject: patch submitted by wolf31o2@gentoo.org to fix the rest of the gensplash woes X-Git-Tag: CATALYST_2_0_6_916~904 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4d1867813f4e9e8799acb3f62ea92040ac65368;p=catalyst.git patch submitted by wolf31o2@gentoo.org to fix the rest of the gensplash woes git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@469 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 357764c2..194d739b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.98 2004/10/18 02:55:16 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.99 2004/10/19 03:39:36 zhen Exp $ + + 18 Oct 2004; John Davis + livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, + livecd/runscript-support/livecdfs-update.sh: + patch submitted by wolf31o2@gentoo.org to fix the rest of the gensplash woes 17 Oct 2004; John Davis livecd/runscript-support/livecdfs-update.sh: diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh index fae27fa0..8aaeda7d 100755 --- a/livecd/runscript-support/kmerge.sh +++ b/livecd/runscript-support/kmerge.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.14 2004/10/18 15:23:14 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.15 2004/10/19 03:39:36 zhen Exp $ die() { echo "$1" @@ -122,7 +122,7 @@ then echo "Unpacking kernel modules from the previous build..." echo [ ! -d /lib/modules ] && mkdir /lib/modules - tar xvjpf /usr/portage/packages/gk_binaries/${clst_fudgeuname}-modules-${clst_version_stamp}.tar.bz2 \ + tar xjpf /usr/portage/packages/gk_binaries/${clst_fudgeuname}-modules-${clst_version_stamp}.tar.bz2 \ -C / || die "Could not unpack kernel modules" else build_kernel ${clst_fudgeuname} diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index 9191c237..54f8ad4a 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.15 2004/10/18 02:55:16 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.16 2004/10/19 03:39:36 zhen Exp $ /usr/sbin/env-update source /etc/profile @@ -26,6 +26,7 @@ rc-update del consolefont rc-update add metalog default rc-update add modules default rc-update add pwgen default +[ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default [ -e /etc/init.d/splash ] && rc-update add splash default # switch the order of rcadd/ rcdel @@ -109,9 +110,9 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/g # setup splash/bootsplash (if called for) if [ "${clst_livecd_splash_type}" == "bootsplash" -a -n "${clst_livecd_splash_theme}" ] then - if [ -d "/etc/bootsplash/${clst_livecd_splash_theme}" ] + if [ -d /etc/bootsplash/${clst_livecd_splash_theme} ] then - sed -i 's/BOOTSPLASH_THEME=\"gentoo\"/BOOTSPLASH_THEME=\"${clst_livecd_bootsplash}\"/' /etc/conf.d/bootsplash + sed -i 's/BOOTSPLASH_THEME=\"gentoo\"/BOOTSPLASH_THEME=\"${clst_livecd_splash_theme}\"/' /etc/conf.d/bootsplash rm /etc/bootsplash/default ln -s "/etc/bootsplash/${clst_livecd_splash_theme}" /etc/bootsplash/default else @@ -121,11 +122,11 @@ then elif [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] then - if [ -d "/etc/splash/${clst_livecd_splash_theme}" ] + if [ -d /etc/splash/${clst_livecd_splash_theme} ] then - sed -i 's/# SPLASH_THEME="gentoo"/SPLASH_THEME=\"${clst_livecd_bootsplash}\"/' /etc/conf.d/splash + sed -i 's/# SPLASH_THEME="gentoo"/SPLASH_THEME=\"${clst_livecd_splash_theme}\"/' /etc/conf.d/splash rm /etc/splash/default - ln -s "/etc/splash/${clst_livecd_splash_theme}" /etc/splash/default + ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default else echo "Error, cannot setup splash theme ${clst_livecd_splash_theme}" exit 1 @@ -133,4 +134,5 @@ then fi # tar up the firmware so that it does not get clobbered by the livecd mounts -tar cjpf /usr/lib/hotplug/firmware/firmware.tar.bz2 /usr/lib/hotplug/firmware/* +[ -n $(ls /usr/lib/hotplug/firmware) ] && tar cjpf /usr/lib/hotplug/firmware.tar.bz2 /usr/lib/hotplug/firmware/* +ln -sf /lib/firmware /usr/lib/hotplug/firmware diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index 9b4da5c1..88c45c4a 100644 --- a/livecd/runscript/x86-archscript.sh +++ b/livecd/runscript/x86-archscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.13 2004/10/16 13:38:09 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.14 2004/10/19 03:39:36 zhen Exp $ case $1 in kernel) @@ -60,7 +60,7 @@ case $1 in echo "F2 help.msg" >> ${icfg} # figure out what device manager we are using and handle it accordingly - if [ ${clst_livecd_devmanager} == "udev" ] + if [ "${clst_livecd_devmanager}" == "udev" ] then cmdline_opts="${cmdline_opts} udev nodevfs" fi @@ -84,7 +84,6 @@ case $1 in echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg} fi - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg} echo >> ${icfg} echo " ${x}" >> ${kmsg} echo "label ${x}-nofb" >> ${icfg}