projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy_addon_file(): do not be verbose to the user, but send it to the log instead
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
d02bb57
..
4d4722a
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-233,7
+233,7
@@
copy_addon_file() {
return $?
fi
if [ -e "$2/$1" ]; then
return $?
fi
if [ -e "$2/$1" ]; then
-
echo
"Copying $1 from system"
+
log
"Copying $1 from system"
cp "$2/$1" "${BUILD_OUTPUT}/boot/$3/"
return $?
fi
cp "$2/$1" "${BUILD_OUTPUT}/boot/$3/"
return $?
fi
@@
-738,8
+738,9
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
for file in memdisk chain.c32 hdt.c32 menu.c32; do
copy_addon_file "${file}" /usr/lib/syslinux addons
done
for file in memdisk chain.c32 hdt.c32 menu.c32; do
copy_addon_file "${file}" /usr/lib/syslinux addons
done
- # make memtest filename FAT16/8.3 compatible
- mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
+
+ # make memtest filename FAT16/8.3 compatible
+ mv "${BUILD_OUTPUT}/boot/addons/memtest86+.bin" \
"${BUILD_OUTPUT}/boot/addons/memtest"
# copy only files so we can handle bsd4grml on its own
"${BUILD_OUTPUT}/boot/addons/memtest"
# copy only files so we can handle bsd4grml on its own