* Add the "-joliet-long" option when making images with Joliet names.

Some packages with ridiculously long names are not unique in the
    first 64 characters, so normal Joliet sorting fails.
This commit is contained in:
cd-builder user 2008-09-08 21:53:45 +00:00
parent 0a1de9d57a
commit b598c30a47
10 changed files with 18 additions and 13 deletions

5
debian/changelog vendored
View File

@ -89,6 +89,11 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
* Include speakup and atl2 modules for i386 and amd64 medias.
* Include multipath-tools-boot for all medias.
[ Steve McIntyre ]
* Add the "-joliet-long" option when making images with Joliet names.
Some packages with ridiculously long names are not unique in the
first 64 characters, so normal Joliet sorting fails.
-- Frans Pop <fjp@debian.org> Mon, 04 Aug 2008 18:59:31 +0200
debian-cd (3.0.4) unstable; urgency=low

View File

@ -86,7 +86,7 @@ if [ $NN = 1 ]; then
mkdir -p boot$N/milo
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
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 "-l"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-alpha-boot boot/bootlx"
@ -94,7 +94,7 @@ if [ $NN = 1 ]; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
else
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
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 "-l"
fi

View File

@ -31,7 +31,7 @@ fi
cd $CDDIR/..
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
# Arm is currently not bootable in lenny, so bail out here
echo "Arm booting disabled, check with Sledge/fjp/tbm"

View File

@ -29,7 +29,7 @@ fi
cd $CDDIR/..
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
# Armel is currently not bootable in lenny, so bail out here
echo "Armel booting disabled, check with Sledge/fjp/tbm"

View File

@ -27,7 +27,7 @@ cd $CDDIR/..
# Only disc 1 bootable
if [ $N != 1 -a $N != 1_NONUS ]; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
exit 0;
fi
@ -52,7 +52,7 @@ install_languages $CDDIR
mkdir -p boot$N/boot
cp -f boot.img boot$N/boot/
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/boot.img"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"

View File

@ -35,7 +35,7 @@ cd $CDDIR/..
# MAXDISKBLOCKS is measured in 2K blocks
newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc`
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe"

View File

@ -24,7 +24,7 @@ if [ ! "$DI_DIST" ]; then
DI_DIST="$DI_CODENAME"
fi
add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J -joliet-long"
# Only disk 1* bootable
if [ $N != 1 -a $N != 1_NONUS ]; then

View File

@ -34,7 +34,7 @@ NN=`echo $N | sed -e 's/_NONUS//'`
cd $CDROOT/..
add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J -joliet-long"
# Mipsel is currently not bootable in lenny, so bail out here
echo "Mipsel booting disabled, check with Sledge or fjp"

View File

@ -25,7 +25,7 @@ CDDIR=$2
cd $CDDIR/..
if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
exit 0
fi

View File

@ -149,7 +149,7 @@ if [ "$THISTYPE" = "isolinux" ]; then
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
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 "-b isolinux/isolinux.bin"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c isolinux/boot.cat"
@ -284,14 +284,14 @@ else
mkdir -p boot$N/boot
cp $THISTYPE/boot.img boot$N/boot/
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
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 "-b boot/boot.img"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"
add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
else
mkdir boot$N
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
fi
fi