projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ifcpu64.c32, vesamenu.c32, isolinux.bin from syslinux-common
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
6a96ce4
..
a59a76a
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-701,8
+701,15
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
bailout 8
fi
bailout 8
fi
+ # copy system-provided isolinux files
+ for file in ifcpu64.c32 isolinux.bin vesamenu.c32; do
+ cp -a "/usr/lib/syslinux/${file}" "${TEMPLATE_DIRECTORY}/boot/isolinux/"
+ done
+
# *always* copy files to output directory so the variables
# get adjusted according to the build
# *always* copy files to output directory so the variables
# get adjusted according to the build
+ # Note: if grml-live-compat is installed, this will update the
+ # system-provided isolinux files.
cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
if [ -n "$NO_ADDONS" ] ; then
cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
if [ -n "$NO_ADDONS" ] ; then
@@
-722,6
+729,8
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
done
# copy only files so we can handle bsd4grml on its own
done
# copy only files so we can handle bsd4grml on its own
+ # Note: if grml-live-compat is installed, this will update the
+ # system-provided files.
for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
done
for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
done