Subject: Removing mkisofs support.

From: Daniel Baumann <[email-masked]>
Date: Fri, 19 Oct 2007 12:54:26 +0200

---
 functions/defaults.sh    | 6 ------
 helpers/lh_binary_iso    | 4 ++--
 helpers/lh_config        | 9 ---------
 helpers/lh_source_debian | 2 +-
 helpers/lh_source_iso    | 4 ++--
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/functions/defaults.sh b/functions/defaults.sh
index fedd160..bfc2694 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -114,12 +114,6 @@ Set_defaults ()
 			;;
 	esac
 
-	# Setting genisoimage
-	if [ -z "${LH_GENISOIMAGE}" ]
-	then
-		LH_GENISOIMAGE="genisoimage"
-	fi
-
 	# Setting initramfs hook
 	if [ -z "${LH_INITRAMFS}" ]
 	then
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 781a007..cf38317 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -53,7 +53,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Checking depends
-Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+Check_package chroot/usr/bin/genisoimage genisoimage
 
 # Restoring cache
 Restore_cache cache/packages_binary
@@ -131,7 +131,7 @@ case "${LH_PACKAGES_LISTS}" in
 esac
 
 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
 
 case "${LH_CHROOT_BUILD}" in
diff --git a/helpers/lh_config b/helpers/lh_config
index 7e99e30..5fc2f7c 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -190,11 +190,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--genisoimage)
-				LH_GENISOIMAGE="${2}"
-				shift 2
-				;;
-
 			--initramfs)
 				LH_INITRAMFS="${2}"
 				shift 2
@@ -655,10 +650,6 @@ LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
 # (Default: ${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
 # (Default: ${LH_INITRAMFS})
 LH_INITRAMFS="${LH_INITRAMFS}"
diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian
index 8811fa6..d1d025c 100755
--- a/helpers/lh_source_debian
+++ b/helpers/lh_source_debian
@@ -66,7 +66,7 @@ ${LH_BOOTLOADER}
 live-helper
 ${LH_INITRAMFS}
 dosfstools
-${LH_GENISOIMAGE}
+genisoimage
 parted
 squashfs-tools
 genext2fs
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index ef7241f..05d94d5 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -58,7 +58,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Checking depends
-Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+Check_package chroot/usr/bin/genisoimage genisoimage
 
 # Installing depends
 Install_package
@@ -103,7 +103,7 @@ fi
 mv source chroot
 
 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
 
 Chroot "sh source.sh"
-- 
cgit v1.0