manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing mkisofs support.

This commit is contained in:
Daniel Baumann 2007-10-19 12:54:26 +02:00
parent 979cd28cc4
commit 24767fd736
5 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/defaults.sh
View File

@ -114,12 +114,6 @@ Set_defaults ()
;; ;;
esac esac
# Setting genisoimage
if [ -z "${LH_GENISOIMAGE}" ]
then
LH_GENISOIMAGE="genisoimage"
fi
# Setting initramfs hook # Setting initramfs hook
if [ -z "${LH_INITRAMFS}" ] if [ -z "${LH_INITRAMFS}" ]
then then

4
helpers/lh_binary_iso
View File

@ -53,7 +53,7 @@ Check_lockfile .lock
Create_lockfile .lock Create_lockfile .lock
# Checking depends # Checking depends
Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE} Check_package chroot/usr/bin/genisoimage genisoimage
# Restoring cache # Restoring cache
Restore_cache cache/packages_binary Restore_cache cache/packages_binary
@ -131,7 +131,7 @@ case "${LH_PACKAGES_LISTS}" in
esac esac
cat > binary.sh << EOF cat > binary.sh << EOF
${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary
EOF EOF
case "${LH_CHROOT_BUILD}" in case "${LH_CHROOT_BUILD}" in

9
helpers/lh_config
View File

@ -190,11 +190,6 @@ Local_arguments ()
shift 2 shift 2
;; ;;
--genisoimage)
LH_GENISOIMAGE="${2}"
shift 2
;;
--initramfs) --initramfs)
LH_INITRAMFS="${2}" LH_INITRAMFS="${2}"
shift 2 shift 2
@ -655,10 +650,6 @@ LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
# (Default: ${LH_DEBCONF_PRIORITY}) # (Default: ${LH_DEBCONF_PRIORITY})
LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
# \$LH_GENISOIMAGE: set genisoimage program
# (Default: ${LH_GENISOIMAGE})
LH_GENISOIMAGE="${LH_GENISOIMAGE}"
# \$LH_INITRAMFS: set initramfs hook # \$LH_INITRAMFS: set initramfs hook
# (Default: ${LH_INITRAMFS}) # (Default: ${LH_INITRAMFS})
LH_INITRAMFS="${LH_INITRAMFS}" LH_INITRAMFS="${LH_INITRAMFS}"

2
helpers/lh_source_debian
View File

@ -66,7 +66,7 @@ ${LH_BOOTLOADER}
live-helper live-helper
${LH_INITRAMFS} ${LH_INITRAMFS}
dosfstools dosfstools
${LH_GENISOIMAGE} genisoimage
parted parted
squashfs-tools squashfs-tools
genext2fs genext2fs

4
helpers/lh_source_iso
View File

@ -58,7 +58,7 @@ Check_lockfile .lock
Create_lockfile .lock Create_lockfile .lock
# Checking depends # Checking depends
Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE} Check_package chroot/usr/bin/genisoimage genisoimage
# Installing depends # Installing depends
Install_package Install_package
@ -103,7 +103,7 @@ fi
mv source chroot mv source chroot
cat >> chroot/source.sh << EOF cat >> chroot/source.sh << EOF
${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source genisoimage ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
EOF EOF
Chroot "sh source.sh" Chroot "sh source.sh"