diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 16 | ||||
| -rwxr-xr-x | functions/losetup.sh | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 61810d160..b8ac6204d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -273,22 +273,6 @@ Set_config_defaults () ;; esac - # Setting fdisk - if [ -z "${LB_FDISK}" ] || [ ! -x "${LB_FDISK}" ] - then - # Workaround for gnu-fdisk divertion - # (gnu-fdisk is buggy, #445304). - if [ -x /sbin/fdisk.distrib ] - then - LB_FDISK="fdisk.distrib" - elif [ -x /sbin/fdisk ] - then - LB_FDISK="fdisk" - else - Echo_error "Can't process file /sbin/fdisk" - fi - fi - # Setting losetup if [ -z "${LB_LOSETUP}" ] || [ "${LB_LOSETUP}" != "/sbin/losetup.orig" ] then diff --git a/functions/losetup.sh b/functions/losetup.sh index 3bcb2feb6..e0d2b6fdb 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -42,7 +42,7 @@ Losetup () PARTITION="${3:-1}" ${LB_LOSETUP} --read-only --partscan "${DEVICE}" "${FILE}" - FDISK_OUT="$(${LB_FDISK} -l -u ${DEVICE} 2>&1)" + FDISK_OUT="$(fdisk -l -u ${DEVICE} 2>&1)" Lodetach "${DEVICE}" LOOPDEVICE="$(echo ${DEVICE}p${PARTITION})" |