Please send your bug reports and feedback to the grml-team: http://grml.org/bugs/
"
+ [ "$(id -u 2>/dev/null)" != 0 ] && echo "Please notice that this script requires root permissions."
}
# make sure it's possible to get usage information without being
# root or actually executing the script
if [ "$1" = '-h' -o "$1" = '--help' ] ; then
usage
- [ "$(id -u 2>/dev/null)" != 0 ] && echo "Please notice that this script requires root permissions."
exit 0
fi
# }}}
# make sure we don't leave any mounts - FAI doesn't remove them always
umount $CHROOT_OUTPUT/proc/sys/fs/binfmt_misc 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true
+ umount $CHROOT_OUTPUT/run 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/sys 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/dev/pts 2>/dev/null || /bin/true
umount $CHROOT_OUTPUT/dev 2>/dev/null || /bin/true
# }}}
# command line parsing {{{
-while getopts "a:C:c:d:D:e:g:i:I:o:r:s:t:U:v:AbBFnNqQuVz" opt; do
+while getopts "a:C:c:d:D:e:g:i:I:o:r:s:t:U:v:AbBFhnNqQuVz" opt; do
case "$opt" in
a) ARCH="$OPTARG" ;;
A) CLEAN_ARTIFACTS=1 ;;
D) GRML_FAI_CONFIG="$(readlink -f $OPTARG)" ;;
e) EXTRACT_ISO_NAME="$(readlink -f $OPTARG)" ;;
g) GRML_NAME="$OPTARG" ;;
+ h) usage ; bailout 0 ;;
i) ISO_NAME="$OPTARG" ;;
I) CHROOT_INSTALL="$OPTARG" ;;
n) SKIP_MKISOFS=1 ;;
[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux'
[ -n "$CLASSES" ] || CLASSES="GRMLBASE,GRML_FULL,$(echo ${ARCH} | tr 'a-z' 'A-Z')"
[ -n "$DATE" ] || DATE="$(date +%Y-%m-%d)"
-[ -n "$DISTRI_INFO" ] || DISTRI_INFO='Grml - Live Linux for system administrators '
+[ -n "$DISTRI_INFO" ] || DISTRI_INFO='Grml - Live Linux for system administrators'
[ -n "$DISTRI_NAME" ] || DISTRI_NAME="grml"
[ -n "$DISTRI_SPLASH" ] || DISTRI_SPLASH='grml.png'
[ -n "$FORCE_ISO_REBUILD" ] || FORCE_ISO_REBUILD="false"
[ -n "$GRML_FAI_CONFIG" ] || GRML_FAI_CONFIG='/etc/grml/fai'
[ -n "$GRML_NAME" ] || GRML_NAME='grml'
[ -n "$HOSTNAME" ] || HOSTNAME='grml'
-[ -n "$HYBRID_METHOD" ] || HYBRID_METHOD='manifold'
+[ -n "$HYBRID_METHOD" ] || HYBRID_METHOD='isohybrid'
[ -n "$NFSROOT_CONF" ] || NFSROOT_CONF="${GRML_FAI_CONFIG}/make-fai-nfsroot.conf"
[ -n "$RELEASENAME" ] || RELEASENAME='grml-live rocks'
[ -n "$SQUASHFS_EXCLUDES_FILE" ] || SQUASHFS_EXCLUDES_FILE="${GRML_FAI_CONFIG}/config/grml/squashfs-excludes"
-[ -n "$SUITE" ] || SUITE='squeeze'
+[ -n "$SUITE" ] || SUITE='testing'
[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
[ -n "$USERNAME" ] || USERNAME='grml'
[ -n "$VERSION" ] || VERSION='0.0.1'
eend 1
bailout 1
fi
- unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*.squashfs ; rc=$?
+ unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*/*.squashfs ; rc=$?
umount "$mountpoint"
rmdir "$mountpoint"
if [ "$rc" != 0 ]; then
bailout 11
fi
+ # EFI boot files
+ if [ -r "${CHROOT_OUTPUT}/boot/efi.img" -a -r "${CHROOT_OUTPUT}/boot/bootx64.efi" ] ; then
+ einfo "Moving EFI boot files into ISO path."
+ log "Moving EFI boot files into ISO path."
+ RC=$0
+ mv "${CHROOT_OUTPUT}/boot/efi.img" "${BUILD_OUTPUT}/boot/" || RC=$?
+ mkdir -p "${BUILD_OUTPUT}/efi/boot/" || RC=$?
+ mv "${CHROOT_OUTPUT}/boot/bootx64.efi" "${BUILD_OUTPUT}/efi/boot/bootx64.efi" || RC=$?
+ eend $?
+ fi
+
[ -n "$TEMPLATE_DIRECTORY" ] || TEMPLATE_DIRECTORY='/usr/share/grml-live/templates'
if ! [ -d "${TEMPLATE_DIRECTORY}"/boot ] ; then
log "Error: ${TEMPLATE_DIRECTORY}/boot does not exist. Exiting."
cp -a "${CHROOT_OUTPUT}"/usr/lib/grub/*-pc/*.lst "${BUILD_OUTPUT}"/boot/grub/
cp -a "${CHROOT_OUTPUT}"/usr/share/grub/ascii.pf2 "${BUILD_OUTPUT}"/boot/grub/
cp -a "${CHROOT_OUTPUT}"/boot/grub/core.img "${BUILD_OUTPUT}"/boot/grub/
+ cp -a "${CHROOT_OUTPUT}"/boot/grub/grub.img "${BUILD_OUTPUT}"/boot/grub/
if ! [ -d "${TEMPLATE_DIRECTORY}"/GRML ] ; then
log "Error: ${TEMPLATE_DIRECTORY}/GRML does not exist. Exiting."
bailout 9
fi
- [ -d "$BUILD_OUTPUT"/GRML ] || mkdir "$BUILD_OUTPUT"/GRML
- cp -a ${TEMPLATE_DIRECTORY}/GRML/* "$BUILD_OUTPUT"/GRML/
+ mkdir -p "$BUILD_OUTPUT"/GRML/"${GRML_NAME}"/
+ cp -a ${TEMPLATE_DIRECTORY}/GRML/* "$BUILD_OUTPUT"/GRML/"${GRML_NAME}"/
# adjust boot splash information:
RELEASE_INFO="$GRML_NAME $VERSION - Release Codename $RELEASENAME"
RELEASE_INFO="$(cut_string 68 "$RELEASE_INFO")"
RELEASE_INFO="$(extend_string_end 68 "$RELEASE_INFO")"
- if [ -r "$BUILD_OUTPUT"/GRML/grml-version ] ; then
- sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/GRML/grml-version
- sed -i "s/%DATE%/$DATE/" "$BUILD_OUTPUT"/GRML/grml-version
+ if [ -r "$BUILD_OUTPUT"/GRML/"${GRML_NAME}"/grml-version ] ; then
+ sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/GRML/"${GRML_NAME}"/grml-version
+ sed -i "s/%DATE%/$DATE/" "$BUILD_OUTPUT"/GRML/"${GRML_NAME}"/grml-version
fi
# make sure the squashfs filename is set accordingly:
if ! [ -r "$DPKG_LIST" ] ; then
ewarn "$DPKG_LIST could not be read, ignoring to store package information on ISO therefore."
else
- einfo "Storing package list information as /GRML/${GRML_NAME}-packages.txt on ISO."
- cp "$DPKG_LIST" "${BUILD_OUTPUT}/GRML/${GRML_NAME}-packages.txt"
+ einfo "Storing package list information as /GRML/${GRML_NAME}/packages.txt on ISO."
+ cp "$DPKG_LIST" "${BUILD_OUTPUT}"/GRML/"${GRML_NAME}"/packages.txt
eend $?
fi
log "Skipping stage 'squashfs' as requested via option -q or -N"
ewarn "Skipping stage 'squashfs' as requested via option -q or -N" ; eend 0
else
- [ -d "$BUILD_OUTPUT"/live ] || mkdir "$BUILD_OUTPUT"/live
+ mkdir -p "$BUILD_OUTPUT"/live/"${GRML_NAME}"/
# make sure we don't leave (even an empty) base.tgz:
[ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
[ -n "$SQUASHFS_INFO_MSG" ] && SQUASHFS_INFO_MSG="using options: $SQUASHFS_INFO_MSG"
einfo "Squashfs build information: running binary $SQUASHFS_BINARY $SQUASHFS_INFO_MSG"
- log "$SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS"
+ log "$SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/${GRML_NAME}/${GRML_NAME}.squashfs -noappend $SQUASHFS_OPTIONS"
- if $SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/"${GRML_NAME}".squashfs \
+ if $SQUASHFS_BINARY $CHROOT_OUTPUT/ $BUILD_OUTPUT/live/"${GRML_NAME}"/"${GRML_NAME}".squashfs \
-noappend $SQUASHFS_OPTIONS 2>"${SQUASHFS_STDERR}" ; then
- echo "${GRML_NAME}.squashfs" > $BUILD_OUTPUT/live/filesystem.module
+ echo "${GRML_NAME}.squashfs" > $BUILD_OUTPUT/live/"${GRML_NAME}"/filesystem.module
log "Finished execution of stage 'squashfs' [$(date)]"
einfo "Finished execution of stage 'squashfs'" ; eend 0
else
# create md5sum file:
if [ -z "$BOOTSTRAP_ONLY" ] ; then
- ( cd $BUILD_OUTPUT/GRML &&
+ ( cd $BUILD_OUTPUT/GRML/"${GRML_NAME}" &&
find .. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums )
fi
# }}}
BOOT_ARGS="-no-emul-boot -boot-load-size 4 -b boot/grub/toriboot.bin"
fi
-# Just until http://bts.grml.org/grml/issue945 has been resolved.
-# HYBRID_METHOD defaults to manifold, so make sure the default works OOTB.
+# Work around http://bts.grml.org/grml/issue945
if [[ $BOOT_METHOD != isolinux && ($HYBRID_METHOD = isohybrid || $HYBRID_METHOD = manifold) ]]; then
log "Setting HYBRID_METHOD to grub2 as hybrid mode does not work with isohybrid yet."
ewarn "Setting HYBRID_METHOD to grub2 as hybrid mode does not work with isohybrid yet."
bailout
fi
- case "$ARCH" in
- amd64)
- # using -eltorito-alt-boot is limited to xorriso for now
- case "$MKISOFS" in
- xorriso*)
- einfo "Using xorriso for ISO generation." ; eend 0
- eindent
-
- if ! dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-1 ; then
- log "Disabling (U)EFI boot support since xorriso version is not recent enough."
- ewarn "Disabling (U)EFI boot support since xorriso version is not recent enough." ; eend 0
- else
- log "xorriso with -eltorito-alt-boot present, enabling (U)EFI boot support."
- einfo "xorriso with -eltorito-alt-boot present, enabling (U)EFI boot support." ; eend 0
-
- if [ -r "${CHROOT_OUTPUT}/var/lib/grml_live_efi.img" ] ; then
- einfo "Found /var/lib/grml_live_efi.img - moving to /boot/efi.img for ISO."
- log "Found /var/lib/grml_live_efi.img - moving to /boot/efi.img for ISO."
- mv "${CHROOT_OUTPUT}/var/lib/grml_live_efi.img" "${BUILD_OUTPUT}/boot/efi.img"
- eend $?
- fi
-
- if [ -r "${CHROOT_OUTPUT}/var/lib/grml_live_bootx64.efi" ] ; then
- einfo "Found /var/lib/grml_live_bootx64.efi - moving to /efi/boot/bootx64.efi for ISO"
- log "Found /var/lib/grml_live_bootx64.efi - moving to /efi/boot/bootx64.efi for ISO"
- mkdir -p "${BUILD_OUTPUT}/efi/boot/"
- mv "${CHROOT_OUTPUT}/var/lib/grml_live_bootx64.efi" "${BUILD_OUTPUT}/efi/boot/bootx64.efi"
- eend $?
- fi
-
- if [ -r "${BUILD_OUTPUT}"/boot/efi.img ] ; then
- einfo "/boot/efi.img found and amd64 architecture present, extending boot arguments."
- log "/boot/efi.img found and amd64 architecture present, extending boot arguments."
- BOOT_ARGS="$BOOT_ARGS -boot-info-table -eltorito-alt-boot -e boot/efi.img -no-emul-boot"
- eend $?
- fi
- fi
+ einfo "Using ${MKISOFS} to build ISO." ; eend 0
+ case "${ARCH}-${MKISOFS}" in
+ # using -eltorito-alt-boot is limited to xorriso for now
+ amd64-xorriso*)
+ eindent
- eoutdent
- ;;
- esac
+ if ! dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-1 ; then
+ log "Disabling (U)EFI boot support because xorriso version is too old."
+ ewarn "Disabling (U)EFI boot support because xorriso version is too old." ; eend 0
+ else
+ if [ -r "${BUILD_OUTPUT}"/boot/efi.img ] ; then
+ einfo "Enabling (U)EFI boot."
+ log "Enabling (U)EFI boot."
+ BOOT_ARGS="$BOOT_ARGS -boot-info-table -eltorito-alt-boot -e boot/efi.img -no-emul-boot"
+ eend $?
+ else
+ log "Disabling (U)EFI boot support because /boot/efi.img is missing."
+ ewarn "Disabling (U)EFI boot support because /boot/efi.img is missing." ; eend 0
+ fi
+ fi
+
+ eoutdent
;;
esac
of="${ISO_OUTPUT}/${ISO_NAME}" 2>/dev/null
# support disabling hybrid ISO image
- if [ "$HYBRID_METHOD" = "disable" ] ; then\
- log "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable"
- einfo "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable"
- eend 0
- elif [ "$HYBRID_METHOD" = "manifold" ] ; then
- # isoinfo is part of both mkisofs and genisoimage so we're good
- bootoff=$(isoinfo -l -i "${ISO_OUTPUT}/${ISO_NAME}" | \
- sed -n '/^.*\[ *\([0-9]*\)[] ].* ISOLINUX.BIN[;1]* *$/s//\1/p')
- if ! [ -r boot/grub/core.img ] ; then
- ewarn "boot/grub/core.img not found, not creating manifold boot ISO file"
- elif [ "${bootoff:-0}" -lt 1 ] ; then
- ewarn "isolinux.bin not found on the ISO file, disabling manifold boot"
- else
- log "Creating hybrid ISO file with manifold method"
- einfo "Creating hybrid ISO file with manifold method"
- if [ "$HYBRID_METHOD" = "grub2" ] ; then
- # 512 bytes: MBR, partition table, load GRUB 2
- echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32
- else
- # read only one but 2048-byte sized (scale: << 2) sector
- echo $bootoff $bootoff | \
- mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2
- fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
- eend $?
- fi
- # use isohybrid as default
- else
- if ! which isohybrid >/dev/null 2>&1 ; then
- bailout 12 "isohybrid binary not found - please install syslinux/syslinux-common"
- else
- log "Creating hybrid ISO file with isohybrid method"
- einfo "Creating hybrid ISO file with isohybrid method"
- # Notes for consideration:
- # "-entry 4 -type 1c"
- # * using 4 as the partition number is supposed to help with BIOSes
- # that only support USB-Zip boot
- # * using 1c (i.e. hidden FAT32 LBA), instead of the default 0x17
- # (hidden NTFS, IIRC), as the partition type is sometimes needed
- # to get the BIOS even look at the partition created by isohybrid
- if isohybrid --help | grep -q -- --uefi ; then
- einfo "Detected uefi support for isohybrid, enabling."
- ISOHYBRID_OPTIONS=--uefi
- fi
+ if [ "$HYBRID_METHOD" = "disable" ] ; then
+ log "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable"
+ einfo "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable"
+ eend 0
+ elif [ "$HYBRID_METHOD" = "manifold" ] || [ "$HYBRID_METHOD" = "grub2" ] ; then
+ # isoinfo is part of both mkisofs and genisoimage so we're good
+ bootoff=$(isoinfo -l -i "${ISO_OUTPUT}/${ISO_NAME}" | \
+ sed -n '/^.*\[ *\([0-9]*\)[] ].* ISOLINUX.BIN[;1]* *$/s//\1/p')
+
+ if ! [ -r boot/grub/core.img ] ; then
+ log "boot/grub/core.img not found, not creating manifold boot ISO file"
+ ewarn "boot/grub/core.img not found, not creating manifold boot ISO file"
+ elif [ "${bootoff:-0}" -lt 1 ] ; then
+ log "isolinux.bin not found on the ISO file, disabling manifold boot"
+ ewarn "isolinux.bin not found on the ISO file, disabling manifold boot"
+ else
+ if [ "$HYBRID_METHOD" = "grub2" ] ; then
+ log "Creating hybrid ISO file with manifold/grub2 method"
+ einfo "Creating hybrid ISO file with manifold/grub2 method"
+ # 512 bytes: MBR, partition table, load GRUB 2
+ echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32
+ else
+ log "Creating hybrid ISO file with manifold method"
+ einfo "Creating hybrid ISO file with manifold method"
+ # read only one but 2048-byte sized (scale: << 2) sector
+ echo $bootoff $bootoff | \
+ mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2
+ fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
+ eend $?
+ fi
+ elif [ "$HYBRID_METHOD" = "isohybrid" ] ; then
+ if ! which isohybrid >/dev/null 2>&1 ; then
+ bailout 12 "isohybrid binary not found - please install syslinux/syslinux-common"
+ else
+ log "Creating hybrid ISO file with isohybrid method"
+ einfo "Creating hybrid ISO file with isohybrid method"
+ # Notes for consideration:
+ # "-entry 4 -type 1c"
+ # * using 4 as the partition number is supposed to help with BIOSes
+ # that only support USB-Zip boot
+ # * using 1c (i.e. hidden FAT32 LBA), instead of the default 0x17
+ # (hidden NTFS, IIRC), as the partition type is sometimes needed
+ # to get the BIOS even look at the partition created by isohybrid
+ if isohybrid --help | grep -q -- --uefi ; then
+ log "Detected uefi support for isohybrid, enabling"
+ einfo "Detected uefi support for isohybrid, enabling"
+ ISOHYBRID_OPTIONS=--uefi
+ fi
- log "isohybrid $ISOHYBRID_OPTIONS ${ISO_OUTPUT}/${ISO_NAME}"
- isohybrid $ISOHYBRID_OPTIONS "${ISO_OUTPUT}/${ISO_NAME}"
- eend $?
- fi
+ log "isohybrid $ISOHYBRID_OPTIONS ${ISO_OUTPUT}/${ISO_NAME}"
+ isohybrid $ISOHYBRID_OPTIONS "${ISO_OUTPUT}/${ISO_NAME}"
+ eend $?
+ fi
+ else
+ bailout 12 "Unknown HYBRID_METHOD [${HYBRID_METHOD}]. Supported values: disable, isohybrid, grub2, manifold"
fi
# generate md5sum and sha1sum of ISO if we are using class 'RELEASE':
if [ -r "${BUILD_OUTPUT}/boot/isolinux/netboot.cfg" ] ; then
cp "${BUILD_OUTPUT}/boot/isolinux/netboot.cfg" "${WORKING_DIR}/pxelinux.cfg/default"
else
- ewarn "File ${BUILD_OUTPUT}/boot/isolinux/netboot.cfg not found." ; eend 0
+ log "File ${BUILD_OUTPUT}/boot/isolinux/netboot.cfg not found."
+ ewarn "File ${BUILD_OUTPUT}/boot/isolinux/netboot.cfg not found."
+ eindent
+ log "Hint: Are you using custom templates which do not provide netboot.cfg?"
+ ewarn "Hint: Are you using custom templates which do not provide netboot.cfg?" ; eend 0
+ eoutdent
fi
if tar -C "$OUTPUTDIR" -jcf "${OUTPUT_FILE}" "grml_netboot_package_${GRML_NAME}_${VERSION}" ; then
- sha1sum "${OUTPUT_FILE}" > "${OUTPUT_FILE}.sha1"
+ (
+ cd $(dirname "${OUTPUT_FILE}")
+ sha1sum $(basename "${OUTPUT_FILE}") > "${OUTPUT_FILE}.sha1"
+ )
einfo "Generated netboot package ${OUTPUT_FILE}" ; eend 0
rm -rf "${OUTPUTDIR}"
else
projects / grml-live.git / blobdiff