summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2011-11-16 20:43:43 +0100
committerAndreas Loibl <andreas@andreas-loibl.de>2011-11-16 20:43:43 +0100
commit303f76c3172316de5113539b4d1a68fc7b2b4d0e (patch)
tree272f9195696a6be559d3a1f3d59a8396b29b344e
parent097f1d44ce8da48ca61dac8d2fa2363fe48c1e6b (diff)
downloadlive-build-master.zip
live-build-master.tar.gz
don't fail if filename doesn't need to be changedHEADmaster
-rwxr-xr-xscripts/build/lb_binary_grub26
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index 549274a..93757db 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -80,13 +80,13 @@ Grub_live_entry ()
if [ -e binary/${KERNEL} ]
then
- mv binary/${KERNEL} "binary/$(dirname ${KERNEL})/vmlinuz${_NUMBER}"
+ mv binary/${KERNEL} "binary/$(dirname ${KERNEL})/vmlinuz${_NUMBER}" | :
KERNEL="$(dirname ${KERNEL})/vmlinuz${_NUMBER}"
fi
if [ -e binary/${INITRD} ]
then
- mv binary/${INITRD} "binary/$(dirname ${INITRD})/initrd${_NUMBER}.img"
+ mv binary/${INITRD} "binary/$(dirname ${INITRD})/initrd${_NUMBER}.img" | :
INITRD="$(dirname ${INITRD})/initrd${_NUMBER}.img"
fi
;;
@@ -295,7 +295,7 @@ cp ${FILES} binary/boot/grub
# Copying local configuration file
if [ -f config/binary_grub/grub.cfg ]
then
- cp config/binary_grub/grub.cfg binary/boot/grub/grub.cfg
+ cp config/binary_grub/grub*.cfg binary/boot/grub/
fi
# Copying splash screen