remove obsolete fdisk hack

8321653cb36511324d576e65cb13b5c9b0c5f438 (from 2007) introduced a hack to
work around bug #445304 in gnu-fdisk for users who may have replaced fdisk
with the classic gnu version. the hack allowed users to select an alternate
fdisk binary to use to work around the buggy binary.

bug #445304 is marked as found in v1.0-1 and fixed in v1.2-1, though may
have been fixe din v1.1. it was marked fixed in 2009.

checking the package archive, gnu-fdisk does not actually exist anymore
in debian, with one exception - it is available for arm64 on sid via
debports, and that version is 1.3 so thus includes the necessary fix
anyway.

it is thus pointless now that we still carry this hack.

Gbp-Dch: Short

3 files changed, 4 insertions, 7 deletions

diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index e9e30ea40..23cc4f0e2 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -53,6 +53,7 @@ esac
 
 Check_package chroot /usr/share/doc/mtools mtools
 Check_package chroot /sbin/parted parted
+Check_package host /sbin/fdisk fdisk
 
 echo "${LB_BOOTLOADERS}" | \
 while IFS="," read -r BOOTLOADER
diff --git a/scripts/build/config b/scripts/build/config
index f32756466..4ec2ea8e9 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -65,7 +65,6 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--distribution-binary CODENAME]\n\
 \t    [--distribution-chroot CODENAME]\n\
 \t    [--dump]\n\
-\t    [--fdisk fdisk|fdisk.dist]\n\
 \t    [--firmware-binary true|false]\n\
 \t    [--firmware-chroot true|false]\n\
 \t    [--force]\n\
@@ -141,7 +140,7 @@ Local_arguments ()
 	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitude-options:,debootstrap-options:,debootstrap-script:,
 		apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-priority:,dump,
-		initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:,
+		initramfs:,initramfs-compression:,initsystem:,losetup:,mode:,system:,tasksel:,
 		architectures:,clean,
 		distribution:,parent-distribution:,parent-debian-installer-distribution:,
 		distribution-chroot:,parent-distribution-chroot:,
@@ -330,7 +329,7 @@ Local_arguments ()
 				;;
 
 			--fdisk)
-				LB_FDISK="${2}"
+				Echo_warning "--fdisk is an obsolete option"
 				shift 2
 				;;
 
@@ -1011,10 +1010,6 @@ LB_INITRAMFS_COMPRESSION="${LB_INITRAMFS_COMPRESSION}"
 # (Default: ${LB_INITSYSTEM})
 LB_INITSYSTEM="${LB_INITSYSTEM}"
 
-# \$LB_FDISK: set fdisk program
-# (Default: autodetected)
-LB_FDISK="${LB_FDISK}"
-
 # \$LB_LOSETUP: set losetup program
 # (Default: autodetected)
 LB_LOSETUP="${LB_LOSETUP}"
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index 16fbc3345..98c9b01e6 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -48,6 +48,7 @@ Create_lockfile .lock
 # Checking depends
 Check_package chroot /sbin/mkdosfs dosfstools
 Check_package chroot /sbin/parted parted
+Check_package host /sbin/fdisk fdisk
 
 # Installing depends
 Install_package