denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more error checking into the splash code and die instead of silently fail on an error.

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@429 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 19 years ago
parent 55b9037838
commit 8b188f898e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
gen_initramfs.sh
Unescape View File

@ -288,7 +288,7 @@ create_evms2_cpio(){
create_gensplash(){ create_gensplash(){
if [ "${GENSPLASH}" -eq '1' ] if [ "${GENSPLASH}" -eq '1' ]
then then
if [ -x /usr/bin/splash_geninitramfs ] if [ -x /usr/bin/splash_geninitramfs ] || [ -x /usr/sbin/splash_geninitramfs ]
then then
[ -z "${GENSPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash [ -z "${GENSPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
[ -z "${GENSPLASH_THEME}" ] && GENSPLASH_THEME=default [ -z "${GENSPLASH_THEME}" ] && GENSPLASH_THEME=default
@ -296,7 +296,7 @@ create_gensplash(){
cd / cd /
local tmp="" local tmp=""
[ -n "${GENSPLASH_RES}" ] && tmp="-r ${GENSPLASH_RES}" [ -n "${GENSPLASH_RES}" ] && tmp="-r ${GENSPLASH_RES}"
splash_geninitramfs -g ${CACHE_CPIO_DIR}/initramfs-splash-${KV}.cpio.gz ${tmp} ${GENSPLASH_THEME} splash_geninitramfs -g ${CACHE_CPIO_DIR}/initramfs-splash-${KV}.cpio.gz ${tmp} ${GENSPLASH_THEME} || gen_die "Could not build splash cpio archive"
if [ -e "/usr/share/splashutils/initrd.splash" ]; then if [ -e "/usr/share/splashutils/initrd.splash" ]; then
if [ -d "${TEMP}/initramfs-gensplash-temp" ] if [ -d "${TEMP}/initramfs-gensplash-temp" ]
then then
@ -304,9 +304,9 @@ create_gensplash(){
fi fi
mkdir -p "${TEMP}/initramfs-gensplash-temp/etc" mkdir -p "${TEMP}/initramfs-gensplash-temp/etc"
cd "${TEMP}/initramfs-gensplash-temp/" cd "${TEMP}/initramfs-gensplash-temp/"
gunzip -c ${CACHE_CPIO_DIR}/initramfs-splash-${KV}.cpio.gz | cpio -idm --quiet -H newc gunzip -c ${CACHE_CPIO_DIR}/initramfs-splash-${KV}.cpio.gz | cpio -idm --quiet -H newc || gen_die "unpacking splash cpio"
cp "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-gensplash-temp/etc" cp -f "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-gensplash-temp/etc"
find . -print | cpio --quiet -o -H newc | gzip -9 > ${CACHE_CPIO_DIR}/initramfs-splash-${KV}.cpio.gz find . -print | cpio --quiet -o -H newc | gzip -9 > ${CACHE_CPIO_DIR}/initramfs-splash-${KV}.cpio.gz || gen_die "compressing splash cpio"
rm -r "${TEMP}/initramfs-gensplash-temp/" rm -r "${TEMP}/initramfs-gensplash-temp/"
fi fi
else else

Write Preview
Loading…
Cancel
Save