projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support environment variable $NO_ADDONS
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
9fca1cc
..
2d0d1f9
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-49,7
+49,7
@@
Usage examples:
$PN
$PN -c GRMLBASE,GRML_MEDIUM,I386 -o /dev/shm/grml
$PN
$PN -c GRMLBASE,GRML_MEDIUM,I386 -o /dev/shm/grml
- $PN -c GRMLBASE,GRML_SMALL,I386 -g grml-small -v 1.0
+ $PN -c GRMLBASE,GRML_SMALL,
REMOVE_DOCS,
I386 -g grml-small -v 1.0
$PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso -v 0.0-1
$PN -c GRMLBASE,GRML_FULL,I386 -s sid -V -r 'grml-live rocks'
$PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso -v 0.0-1
$PN -c GRMLBASE,GRML_FULL,I386 -s sid -V -r 'grml-live rocks'
@@
-481,11
+481,13
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
ewarn "$BUILD_OUTPUT/boot exists already, skipping stage 'boot'" ; eend 0
else
# booting stuff:
ewarn "$BUILD_OUTPUT/boot exists already, skipping stage 'boot'" ; eend 0
else
# booting stuff:
- [ -d "$BUILD_OUTPUT"/boot/addons ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
[ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux
[ -d "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"
[ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux
[ -d "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"
- cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
+ if [ -z "$NO_ADDONS" ] ; then
+ [ -d "$BUILD_OUTPUT"/boot/addons ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
+ cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
+ fi
# if we don't have an initrd we a) can't boot and b) there was an error
# during build, so check for the file:
# if we don't have an initrd we a) can't boot and b) there was an error
# during build, so check for the file:
@@
-516,7
+518,10
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
fi
cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
fi
cp ${TEMPLATE_DIRECTORY}/boot/isolinux/* "$BUILD_OUTPUT"/boot/isolinux/
- cp ${TEMPLATE_DIRECTORY}/boot/addons/* "$BUILD_OUTPUT"/boot/addons/
+
+ if [ -z "$NO_ADDONS" ] ; then
+ cp ${TEMPLATE_DIRECTORY}/boot/addons/* "$BUILD_OUTPUT"/boot/addons/
+ fi
if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/
if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
cp -a ${TEMPLATE_DIRECTORY}/boot/grub "$BUILD_OUTPUT"/boot/