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

Backport --joliet-long fix from master

This commit is contained in:
Steve McIntyre 2018-02-10 00:33:07 +00:00
parent 06fead6041
commit 7dcb4409ca
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -29,6 +29,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
+ Make tools/update_popcon exit with errors when it fails + Make tools/update_popcon exit with errors when it fails
+ Make tools/update_popcon deal with https on popcon.d.o + Make tools/update_popcon deal with https on popcon.d.o
+ Declare 'my' instances of '$_' as 'local' in tools/make_disc_trees.pl + Declare 'my' instances of '$_' as 'local' in tools/make_disc_trees.pl
+ Ensure that in all places where we use -J we also use --joliet-long
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

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"

4
update-cd
View File

@ -161,7 +161,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 \
@ -203,7 +203,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