X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=21910c7e2ff532aa733648e6bba3071c433d9f9b;hp=ccef89f3399ed75b80680ea00a6f124bb444c6be;hb=d039e207a6fea49a966168e7d31487b86840af11;hpb=f50c895a926507183a16300dd460d3e71010cbe9 diff --git a/grml-live b/grml-live index ccef89f..21910c7 100755 --- a/grml-live +++ b/grml-live @@ -71,6 +71,8 @@ Usage: $PN [options, see as follows] -U arrange output to be owned by specified username -v specify version number of the release -V increase verbosity in the build process + -w wayback machine, build system using Debian archives + from specified date -z use ZLIB instead of LZMA/XZ compression Usage examples: @@ -277,12 +279,12 @@ extend_string_end() { # This is because: # * We assume that the chroot always has a "good" version of # the file. Also it makes sources handling easier. -# * On unstable, we Recommend the Debian packages containing +# * On unstable, we recommend the Debian packages containing # these files. The user can override them by putting his # "better" version into the chroot. -# * On stable, the Debian packages are probably not available, -# or outdated, so we look in TEMPLATE_DIRECTORY/compat first, where -# our grml-live-compat package installs current file versions. +# * With older releases the Debian packages are probably +# not available, so we look in TEMPLATE_DIRECTORY/compat, +# where a (custom) package might install current file versions. copy_addon_file() { DEST="${BUILD_OUTPUT}/boot/$3" if [ ! -d "${DEST}/" ]; then @@ -294,7 +296,7 @@ copy_addon_file() { return $? fi if [ -e "${TEMPLATE_DIRECTORY}/compat/$3/$1" ]; then - log "Copying $1 from grml-live-compat" + log "Copying $1 from ${TEMPLATE_DIRECTORY}/compat" cp "${TEMPLATE_DIRECTORY}/compat/$3/$1" "${DEST}/" return $? fi @@ -311,7 +313,7 @@ copy_addon_file() { # }}} # command line parsing {{{ -while getopts "a:C:c:d:D:e:g:i:I:o:r:s:S:t:U:v:AbBFhnNqQuVz" opt; do +while getopts "a:C:c:d:D:e:g:i:I:o:r:s:S:t:U:v:w:AbBFhnNqQuVz" opt; do case "$opt" in a) ARCH="$OPTARG" ;; A) CLEAN_ARTIFACTS=1 ;; @@ -340,6 +342,7 @@ while getopts "a:C:c:d:D:e:g:i:I:o:r:s:S:t:U:v:AbBFhnNqQuVz" opt; do u) UPDATE=1 ;; U) CHOWN_USER="$OPTARG" ;; V) VERBOSE="-v" ;; + w) export WAYBACK_DATE="$OPTARG" ;; z) SQUASHFS_ZLIB=1 ;; ?) echo "invalid option -$OPTARG" >&2; usage; bailout 1 ;; esac @@ -399,7 +402,7 @@ fi [ -n "$VERSION" ] || VERSION='0.0.1' # output specific stuff, depends on $OUTPUT (iff not set): -[ -n "$OUTPUT" ] || OUTPUT='/grml/grml-live' +[ -n "$OUTPUT" ] || OUTPUT="$PWD/grml/" [ -n "$BUILD_OUTPUT" ] || BUILD_OUTPUT="$OUTPUT/grml_cd" [ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot" [ -n "$ISO_OUTPUT" ] || ISO_OUTPUT="$OUTPUT/grml_isos" @@ -631,7 +634,11 @@ fi # generate nfsroot configuration for FAI on the fly if [ -z "$FAI_DEBOOTSTRAP" ] ; then - FAI_DEBOOTSTRAP="$SUITE http://ftp.debian.org/debian" + if [ -n "$WAYBACK_DATE" ] ; then + FAI_DEBOOTSTRAP="$SUITE http://snapshot.debian.org/archive/debian/$WAYBACK_DATE/" + else + FAI_DEBOOTSTRAP="$SUITE http://ftp.debian.org/debian" + fi fi if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then @@ -693,7 +700,7 @@ else mount --bind "${OUTPUT}/grml_sources/" "${CHROOT_OUTPUT}/grml-live/sources/" log "Executed FAI command line:" - log "BUILD_ONLY=$BUILD_ONLY BOOTSTRAP_ONLY=$BOOTSTRAP_ONLY GRML_LIVE_CONFIG=$CONFIGDUMP fai $VERBOSE -C $GRML_FAI_CONFIG -s file:///$GRML_FAI_CONFIG/config -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS" + log "BUILD_ONLY=$BUILD_ONLY BOOTSTRAP_ONLY=$BOOTSTRAP_ONLY GRML_LIVE_CONFIG=$CONFIGDUMP WAYBACK_DATE=$WAYBACK_DATE fai $VERBOSE -C $GRML_FAI_CONFIG -s file:///$GRML_FAI_CONFIG/config -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS" BUILD_ONLY="$BUILD_ONLY" BOOTSTRAP_ONLY="$BOOTSTRAP_ONLY" GRML_LIVE_CONFIG="$CONFIGDUMP" fai $VERBOSE \ -C "$GRML_FAI_CONFIG" -s "file:///$GRML_FAI_CONFIG/config" -c"$CLASSES" \ -u "$HOSTNAME" "$FAI_ACTION" "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE @@ -809,7 +816,7 @@ else EOF - for package in $(awk '{print $1}' "${CHECKLOG}/package_errors.log") ; do + for package in $(awk '{print $1}' "${CHECKLOG}/package_errors.log" | sed 's;/;\\/;') ; do failure_reason="$(awk "/$package/ {print \$2}" "${CHECKLOG}/package_errors.log")" cat >> "${REPORT_MISSING_PACKAGES}" << EOF @@ -928,7 +935,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then log "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ewarn "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ; eend 0 else - # copy addons from system packages or grml-live-compat + # copy addons from system packages or grml-live-addons copy_addon_file ipxe.lkrn /usr/lib/ipxe addons copy_addon_file pci.ids /usr/share/misc addons copy_addon_file memtest86+.bin /boot addons @@ -1433,6 +1440,10 @@ else 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 + sha512sum ${ISO_NAME} > ${ISO_NAME}.sha512 && \ + touch -r ${ISO_NAME} ${ISO_NAME}.sha512 fi ) ;; @@ -1513,6 +1524,8 @@ create_netbootpackage() { ( cd $(dirname "${OUTPUT_FILE}") sha1sum $(basename "${OUTPUT_FILE}") > "${OUTPUT_FILE}.sha1" + 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}"