public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Handle the case where there is no GRUB 1 splash image.

Browse Source 
svn path=/nixos/trunk/; revision=33830
This commit is contained in:
Eelco Dolstra 2012-04-18 14:28:30 +00:00
parent 6f646750cf
commit cb74284b75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/installer/grub/grub-menu-builder.sh
View File

@ -45,13 +45,13 @@ fi
prologue() { prologue() {
case "$grubVersion" in case "$grubVersion" in
1) 1)
cp -f "@splashImage@" /boot/background.xpm.gz
cat > "$1" << GRUBEND cat > "$1" << GRUBEND
# Automatically generated. DO NOT EDIT THIS FILE! # Automatically generated. DO NOT EDIT THIS FILE!
default @default@ default @default@
timeout @timeout@ timeout @timeout@
GRUBEND GRUBEND
if test -n "@splashImage@"; then if [ -n "@splashImage@" ]; then
cp -f "@splashImage@" /boot/background.xpm.gz
echo "splashimage $bootRoot/background.xpm.gz" >> "$1" echo "splashimage $bootRoot/background.xpm.gz" >> "$1"
fi fi
;; ;;
@ -147,7 +147,7 @@ copyToKernelsDir() {
# kernels or initrd if this script is ever interrupted. # kernels or initrd if this script is ever interrupted.
if ! test -e $dst; then if ! test -e $dst; then
local dstTmp=$dst.tmp.$$ local dstTmp=$dst.tmp.$$
cp $src $dstTmp cp "$src" "$dstTmp"
mv $dstTmp $dst mv $dstTmp $dst
fi fi
filesCopied[$dst]=1 filesCopied[$dst]=1