projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use blocksize of 256 when running mksquashfs-lzma binary
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
207ccb0
..
66075e8
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-23,7
+23,7
@@
fi
set -e
# global variables
set -e
# global variables
-GRML_LIVE_VERSION='0.9.2
2
'
+GRML_LIVE_VERSION='0.9.2
3-prerelease
'
PN="$(basename $0)"
CMDLINE="$0 $@"
ISO_DATE="$(date +%Y-%m-%d)"
PN="$(basename $0)"
CMDLINE="$0 $@"
ISO_DATE="$(date +%Y-%m-%d)"
@@
-256,7
+256,7
@@
shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter
[ -n "$OUTPUT" ] || OUTPUT='/grml/grml-live'
[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks'
[ -n "$SQUASHFS_EXCLUDES_FILE " ] || SQUASHFS_EXCLUDES_FILE='/etc/grml/fai/squashfs-excludes'
[ -n "$OUTPUT" ] || OUTPUT='/grml/grml-live'
[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks'
[ -n "$SQUASHFS_EXCLUDES_FILE " ] || SQUASHFS_EXCLUDES_FILE='/etc/grml/fai/squashfs-excludes'
-[ -n "$SUITE" ] || SUITE='
stable
'
+[ -n "$SUITE" ] || SUITE='
lenny
'
[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
[ -n "$USERNAME" ] || USERNAME='grml'
[ -n "$VERSION" ] || VERSION='0.0.1'
[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
[ -n "$USERNAME" ] || USERNAME='grml'
[ -n "$VERSION" ] || VERSION='0.0.1'
@@
-516,7
+516,8
@@
else
chmod 644 $CHROOT_OUTPUT/etc/grml_version
einfo "Rebuilding initramfs"
# make sure new /etc/grml_version reaches the initramfs:
chmod 644 $CHROOT_OUTPUT/etc/grml_version
einfo "Rebuilding initramfs"
# make sure new /etc/grml_version reaches the initramfs:
- chroot $CHROOT_OUTPUT update-initramfs -u -t
+ # chroot $CHROOT_OUTPUT update-initramfs -u -t => might break when using kernel-package :(
+ chroot $CHROOT_OUTPUT update-initramfs -u -k all
eend $?
fi
eend $?
fi
@@
-806,9
+807,10
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
md5sum ${file}.exe > ${file}.exe.md5
done )
fi
md5sum ${file}.exe > ${file}.exe.md5
done )
fi
+
+ log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]"
+ einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0
fi
fi
- log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]"
- einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0
fi
FORCE_ISO_REBUILD=true
fi
FORCE_ISO_REBUILD=true
@@
-887,6
+889,10
@@
else
;;
esac
fi
;;
esac
fi
+
+ # if we still want to use mksquashfs-lzma then let's choose
+ # blocksize 256k as this gives best result with regards to time + comopression
+ [[ "$SQUASHFS_BINARY" == "mksquashfs-lzma" ]] && SQUASHFS_OPTIONS="-b 256k"
fi
fi
fi
fi