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

lose extra - on -joliet-long

This commit is contained in:
Steve McIntyre 2018-02-10 12:07:52 +00:00
parent 002003bc70
commit 9739df55f6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,7 +7,7 @@ debian-cd (3.1.21-stretch) UNRELEASED; urgency=medium
+ Fix for update-cd: Add SHA256 checksums to Packages files for update images + Fix for update-cd: Add SHA256 checksums to Packages files for update images
+ 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
+ Ensure that in all places where we use -J we also use --joliet-long + Ensure that in all places where we use -J we also use -joliet-long
-- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:39:58 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:39:58 +0100

10
tools/set_mkisofs_opts
View File

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

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 --joliet-long -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 --joliet-long -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