summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_iso
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-10-04 20:35:28 -0300
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commit428f4d972f38a4774107d5ea934774fca591f77b (patch)
tree5b55d3354e412e23051c07a5a5d35d54a741dbea /helpers/lh_binary_iso
parentcda480d29c9ea7d28b79669fcd34c6da5b4f5416 (diff)
downloadvyos-live-build-428f4d972f38a4774107d5ea934774fca591f77b.tar.gz
vyos-live-build-428f4d972f38a4774107d5ea934774fca591f77b.zip
iso: use -allow-multidot option when calling genisoimage
To properly support syslinux menus we need to provide fonts (specially when using accents and like) and those files are usually found on systems using multiple dots on their filenames (e.g iso01.f14.psf) and then makes sense to support this by default or our users can spent _a lot_ of time to sort this kind of problem out. While doing it, the duplicated command line has been removed and code changed to avoid this duplication making future changes need to touch just one place.
Diffstat (limited to 'helpers/lh_binary_iso')
-rwxr-xr-xhelpers/lh_binary_iso13
1 files changed, 5 insertions, 8 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 11280ee4d..781a00703 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -130,15 +130,16 @@ case "${LH_PACKAGES_LISTS}" in
;;
esac
+cat > binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary
+EOF
+
case "${LH_CHROOT_BUILD}" in
enabled)
# Moving image
+ mv binary.sh chroot
mv binary chroot
-cat > chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
-EOF
-
Chroot "sh binary.sh"
# Move image
@@ -147,10 +148,6 @@ EOF
;;
disabled)
-cat > binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
-EOF
-
sh binary.sh
rm -f binary.sh
;;