Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that in all places where we use -J we also use --joliet-long 

Thanks to Thomas Schmitt again for a clear bug report!
This commit is contained in:
Steve McIntyre 2018-02-10 00:29:15 +00:00
parent 4200913c82
commit 6112370e0a
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,5 +1,9 @@
debian-cd (3.1.22) UNRELEASED; urgency=medium debian-cd (3.1.22) UNRELEASED; urgency=medium
[ Steve McIntyre ]
* Ensure that in all places where we use -J we also use
--joliet-long. Thanks to Thomas Schmitt again for a clear bug report!
-- Steve McIntyre <93sam@debian.org> Sat, 10 Feb 2018 00:26:46 +0000 -- Steve McIntyre <93sam@debian.org> Sat, 10 Feb 2018 00:26:46 +0000
debian-cd (3.1.21) unstable; urgency=medium debian-cd (3.1.21) unstable; urgency=medium

2
tools/boot/buster/boot-s390x
View File

@ -27,7 +27,6 @@ INSTALLDIR="install"
# Exit if this is not CD#1/DVD#1 # Exit if this is not CD#1/DVD#1
if [ $N != "1" ]; then if [ $N != "1" ]; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
exit 0 exit 0
@ -100,5 +99,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/" cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
# Include the boot$N/-tree into the iso-image # Include the boot$N/-tree into the iso-image
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N" add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

2
tools/boot/jessie/boot-s390x
View File

@ -27,7 +27,6 @@ CDDIR=$2
cd $CDDIR/.. cd $CDDIR/..
if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
exit 0 exit 0
fi fi
@ -90,5 +89,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/" cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
# Include the boot$N/-tree into the iso-image # Include the boot$N/-tree into the iso-image
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N" add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

2
tools/boot/stretch/boot-s390x
View File

@ -27,7 +27,6 @@ INSTALLDIR="install"
# Exit if this is not CD#1/DVD#1 # Exit if this is not CD#1/DVD#1
if [ $N != "1" ]; then if [ $N != "1" ]; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
exit 0 exit 0
@ -100,5 +99,4 @@ perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/" cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
# Include the boot$N/-tree into the iso-image # Include the boot$N/-tree into the iso-image
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N" add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"

14
tools/set_mkisofs_opts
View File

@ -16,16 +16,22 @@ OPTS=
case "$ARCH" in case "$ARCH" in
i386) i386)
OPTS="-J" OPTS="-J --joliet-long"
;; ;;
amd64) amd64)
OPTS="-J" OPTS="-J --joliet-long"
;; ;;
alpha) alpha)
OPTS="-J" OPTS="-J --joliet-long"
;;
arm*)
OPTS="-J --joliet-long"
;;
s390*)
OPTS="-J --joliet-long"
;; ;;
*) *)
#No options by default #No options by default - don't know about other arches
;; ;;
esac esac

4
update-cd
View File

@ -158,7 +158,7 @@ make_cd () {
if [ $JTE = 1 ] ; then if [ $JTE = 1 ] ; then
set +e set +e
${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \ ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
${ISODIR}/${BASENAME}.iso \ ${ISODIR}/${BASENAME}.iso \
-jigdo-jigdo ${JIGDODIR}/${BASENAME}.jigdo \ -jigdo-jigdo ${JIGDODIR}/${BASENAME}.jigdo \
-jigdo-template ${JIGDODIR}/${BASENAME}.template \ -jigdo-template ${JIGDODIR}/${BASENAME}.template \
@ -200,7 +200,7 @@ make_cd () {
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
else else
set +e set +e
${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \ ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
$OUT/iso-$TYPE/${BASENAME}.iso \ $OUT/iso-$TYPE/${BASENAME}.iso \
$UPD/CD$CDNUM 2>&1 | grep "extents written" $UPD/CD$CDNUM 2>&1 | grep "extents written"
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then