Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop vestigial genisoimage/mkisofs support #172

Merged
merged 4 commits into from
Nov 23, 2024
Merged

Drop vestigial genisoimage/mkisofs support #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8812d99
grml-live-remaster: always use xorriso
zeha Nov 22, 2024
b8458a1
grml-live-remaster: drop support for ISOs < Dec 2018
zeha Nov 22, 2024
0736c3c
grml-live: drop support for mkisofs/genisoimage
zeha Nov 22, 2024
fab9fdf
GRML_FULL: stop installing genisoimage
zeha Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions etc/grml/fai/config/package_config/GRML_FULL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@ e2fsprogs
exfat-fuse
exfatprogs
f2fs-tools
genisoimage
jfsutils
ntfs-3g
reiserfsprogs
tcplay
xfsdump
xfsprogs
xmount
xorriso

# foreign os support/recovery
chntpw
Expand All @@ -120,7 +120,6 @@ mtools
cpp
sqlite3
whois
xorriso

# install linux
cdebootstrap
Expand Down
13 changes: 4 additions & 9 deletions grml-live
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,23 +1617,18 @@ else
einfo "Forcing rebuild of ISO because files on ISO have been modified."
fi

# support xorriso as well mkisofs and genisoimage
if which xorriso >/dev/null 2>&1 ; then
MKISOFS='xorriso -as mkisofs'
elif which mkisofs >/dev/null 2>&1; then
MKISOFS='mkisofs'
elif which genisoimage >/dev/null 2>&1; then
MKISOFS='genisoimage'
else
log "Error: neither xorriso nor mkisofs nor genisoimage available - can not create ISO."
eerror "Error: neither xorriso nor mkisofs nor genisoimage available - can not create ISO." ; eend 1
log "Error: xorriso not available - can not create ISO."
eerror "Error: xorriso not available - can not create ISO." ; eend 1
bailout
fi

einfo "Using ${MKISOFS} to build ISO." ; eend 0
case "${ARCH}-${MKISOFS}" in
case "${ARCH}" in
# using -eltorito-alt-boot is limited to xorriso for now
amd64-xorriso*)
amd64)
eindent

if ! dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-1 ; then
Expand Down
23 changes: 7 additions & 16 deletions remaster/grml-live-remaster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,10 @@ fi

set -e # exit on any error

if [ -d /run/live/medium/ ] ; then # since Dec 2018
LIVE_PATH_MAIN='/run/live/medium/'
LIVE_PATH_BOOT='/run/live/medium/boot/'
else # until Dec 2018
LIVE_PATH_MAIN='/lib/live/mount/medium/'
LIVE_PATH_BOOT='/lib/live/mount/medium/boot/'
fi
LIVE_PATH_MAIN='/run/live/medium/'
LIVE_PATH_BOOT='/run/live/medium/boot/'

VERSION='0.0.4'
VERSION='0.0.5'
GRML_LIVE_EDITOR=${VISUAL:-${EDITOR:-vi}}

# source core functions {{{
Expand All @@ -49,16 +44,12 @@ if ! isgrmlcd ; then
fi

# make sure we have what we need {{{
if check4progs mkisofs >/dev/null 2>&1 ; then
MKISO=mkisofs
fi

if check4progs genisoimage >/dev/null 2>&1 ; then
MKISO=genisoimage
if check4progs xorriso >/dev/null 2>&1 ; then
MKISO='xorriso -as mkisofs'
fi

if [ -z "$MKISO" ] ; then
echo "Error: neither mkisofs nor genisoimage available. Exiting." >&2
echo "Error: xorriso not installed. Exiting." >&2
exit 1
fi

Expand All @@ -69,7 +60,7 @@ if [ -z "$MKSQUASHFS" ] ; then
if which mksquashfs >/dev/null 2>&1 ; then
MKSQUASHFS=mksquashfs
else
echo "Error: mksquashfs is not available. Exiting." >&2
echo "Error: mksquashfs not installed. Exiting." >&2
exit 1
fi
fi
Expand Down