projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netboot creation: no longer compress the tarball + only generate sha256 checksum...
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
e0d55f4
..
9e53c46
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-974,7
+974,7
@@
grub_setup() {
;;
*)
log "Secure Boot method '${SECURE_BOOT}' is unsupported."
;;
*)
log "Secure Boot method '${SECURE_BOOT}' is unsupported."
- error "Secure Boot method '${SECURE_BOOT}' is unsupported." ; eend 1
+ e
e
rror "Secure Boot method '${SECURE_BOOT}' is unsupported." ; eend 1
bailout 59
;;
esac
bailout 59
;;
esac
@@
-1385,8
+1385,8
@@
else
# use sane defaults if $SQUASHFS_OPTIONS isn't set
if [ -z "$SQUASHFS_OPTIONS" ] ; then
# use sane defaults if $SQUASHFS_OPTIONS isn't set
if [ -z "$SQUASHFS_OPTIONS" ] ; then
- # use block
size 256k as this gives best
result with regards to time + compression
- SQUASHFS_OPTIONS="-b
256k
"
+ # use block
size 1m as this gives good
result with regards to time + compression
+ SQUASHFS_OPTIONS="-b
1m
"
# set lzma/xz compression by default, unless -z option has been specified on command line
if [ -z "$SQUASHFS_ZLIB" ] ; then
# set lzma/xz compression by default, unless -z option has been specified on command line
if [ -z "$SQUASHFS_ZLIB" ] ; then
@@
-1582,14
+1582,8
@@
else
[ "$RC" = 0 ] && \
(
if cd $ISO_OUTPUT ; then
[ "$RC" = 0 ] && \
(
if cd $ISO_OUTPUT ; then
- md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \
- touch -r ${ISO_NAME} ${ISO_NAME}.md5
- sha1sum ${ISO_NAME} > ${ISO_NAME}.sha1 && \
- touch -r ${ISO_NAME} ${ISO_NAME}.sha1
sha256sum ${ISO_NAME} > ${ISO_NAME}.sha256 && \
touch -r ${ISO_NAME} ${ISO_NAME}.sha256
sha256sum ${ISO_NAME} > ${ISO_NAME}.sha256 && \
touch -r ${ISO_NAME} ${ISO_NAME}.sha256
- sha512sum ${ISO_NAME} > ${ISO_NAME}.sha512 && \
- touch -r ${ISO_NAME} ${ISO_NAME}.sha512
fi
)
;;
fi
)
;;
@@
-1611,7
+1605,7
@@
fi
# netboot package {{{
create_netbootpackage() {
# netboot package {{{
create_netbootpackage() {
- local OUTPUT_FILE="${NETBOOT}/grml_netboot_package_${GRML_NAME}_${VERSION}.tar
.bz2
"
+ local OUTPUT_FILE="${NETBOOT}/grml_netboot_package_${GRML_NAME}_${VERSION}.tar"
if [ -f "${OUTPUT_FILE}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then
log "Skipping stage 'netboot' as $OUTPUT_FILE exists already."
if [ -f "${OUTPUT_FILE}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then
log "Skipping stage 'netboot' as $OUTPUT_FILE exists already."
@@
-1713,12
+1707,10
@@
create_netbootpackage() {
fi
fi
fi
fi
- if tar -C "$OUTPUTDIR" -
j
cf "${OUTPUT_FILE}" "grml_netboot_package_${GRML_NAME}_${VERSION}" ; then
+ if tar -C "$OUTPUTDIR" -cf "${OUTPUT_FILE}" "grml_netboot_package_${GRML_NAME}_${VERSION}" ; then
(
cd $(dirname "${OUTPUT_FILE}")
(
cd $(dirname "${OUTPUT_FILE}")
- sha1sum $(basename "${OUTPUT_FILE}") > "${OUTPUT_FILE}.sha1"
sha256sum $(basename "${OUTPUT_FILE}") > "${OUTPUT_FILE}.sha256"
sha256sum $(basename "${OUTPUT_FILE}") > "${OUTPUT_FILE}.sha256"
- sha512sum $(basename "${OUTPUT_FILE}") > "${OUTPUT_FILE}.sha512"
)
einfo "Generated netboot package ${OUTPUT_FILE}" ; eend 0
rm -rf "${OUTPUTDIR}"
)
einfo "Generated netboot package ${OUTPUT_FILE}" ; eend 0
rm -rf "${OUTPUTDIR}"