diff options
| -rw-r--r-- | src/scripts/configure.sh | 27 | ||||
| -rwxr-xr-x | src/scripts/genfiles.sh | 1 | ||||
| -rw-r--r-- | src/scripts/iperd.profile | 2 |
3 files changed, 1 insertions, 29 deletions
diff --git a/src/scripts/configure.sh b/src/scripts/configure.sh index 3c3914c..64d9440 100644 --- a/src/scripts/configure.sh +++ b/src/scripts/configure.sh | |||
| @@ -78,7 +78,6 @@ configure_all() | |||
| 78 | echo "CONFIG_PART_TYPE=${CONFIG_PART_TYPE}" >> ${CONFIG}.new.tmp | 78 | echo "CONFIG_PART_TYPE=${CONFIG_PART_TYPE}" >> ${CONFIG}.new.tmp |
| 79 | echo "CONFIG_PART_SIZE=${CONFIG_PART_SIZE}" >> ${CONFIG}.new.tmp | 79 | echo "CONFIG_PART_SIZE=${CONFIG_PART_SIZE}" >> ${CONFIG}.new.tmp |
| 80 | echo "CONFIG_IMG_SIZE=${CONFIG_IMG_SIZE}" >> ${CONFIG}.new.tmp | 80 | echo "CONFIG_IMG_SIZE=${CONFIG_IMG_SIZE}" >> ${CONFIG}.new.tmp |
| 81 | echo "CONFIG_ISO_TYPE=${CONFIG_ISO_TYPE}" >> ${CONFIG}.new.tmp | ||
| 82 | 81 | ||
| 83 | # copy new settings into place | 82 | # copy new settings into place |
| 84 | mv ${CONFIG}.new.tmp ${CONFIG}.new | 83 | mv ${CONFIG}.new.tmp ${CONFIG}.new |
| @@ -108,7 +107,6 @@ configure_disk() | |||
| 108 | 20 70 13 \ | 107 | 20 70 13 \ |
| 109 | "usb" "USB partition type (${CONFIG_PART_TYPE})" \ | 108 | "usb" "USB partition type (${CONFIG_PART_TYPE})" \ |
| 110 | "size" "USB disk image size (${CONFIG_IMG_SIZE} MB)" \ | 109 | "size" "USB disk image size (${CONFIG_IMG_SIZE} MB)" \ |
| 111 | "iso" "ISO partition type (${CONFIG_ISO_TYPE})" \ | ||
| 112 | "tls" "TLS Certificate check (${CONFIG_TLS_CHECK})" \ | 110 | "tls" "TLS Certificate check (${CONFIG_TLS_CHECK})" \ |
| 113 | 2>&1 1>&3)" | 111 | 2>&1 1>&3)" |
| 114 | RC=$? | 112 | RC=$? |
| @@ -157,27 +155,6 @@ configure_disk() | |||
| 157 | --msgbox "Invalid disk image size. Size must be specified as number of megabytes." \ | 155 | --msgbox "Invalid disk image size. Size must be specified as number of megabytes." \ |
| 158 | 7 40 | 156 | 7 40 |
| 159 | fi | 157 | fi |
| 160 | elif test $RC -eq 0 && test "x${RESULT}" == "xiso";then | ||
| 161 | TMP_UEFI=off; TMP_HYBRID=off; TMP_BIOS=off; | ||
| 162 | case "x${CONFIG_ISO_TYPE}" in | ||
| 163 | xuefi) TMP_UEFI=on;; | ||
| 164 | xhybrid) TMP_HYBRID=on;; | ||
| 165 | xbios) TMP_BIOS=on;; | ||
| 166 | *) TMP_BIOS=on;; | ||
| 167 | esac | ||
| 168 | exec 3>&1 | ||
| 169 | RESULT="$(echo "" | xargs dialog \ | ||
| 170 | --title " ISO Disk Type " \ | ||
| 171 | --backtitle "IP Engineering Rescue Disk Setup" \ | ||
| 172 | --radiolist "Choose ISO image type:" \ | ||
| 173 | 20 70 13 \ | ||
| 174 | "uefi" "GUID Partition Table (UEFI)" ${TMP_UEFI} \ | ||
| 175 | "hybrid" "Hybrid (GPT and MBR)" ${TMP_HYBRID} \ | ||
| 176 | "bios" "Master Boot Record (Legacy BIOS)" ${TMP_BIOS} \ | ||
| 177 | 2>&1 1>&3)" | ||
| 178 | RC=$? | ||
| 179 | exec 3>&- | ||
| 180 | CONFIG_ISO_TYPE="${RESULT}" | ||
| 181 | elif test $RC -eq 0 && test "x${RESULT}" == "xtls";then | 158 | elif test $RC -eq 0 && test "x${RESULT}" == "xtls";then |
| 182 | exec 3>&1 | 159 | exec 3>&1 |
| 183 | RESULT="$(echo "" | xargs dialog \ | 160 | RESULT="$(echo "" | xargs dialog \ |
| @@ -286,14 +263,13 @@ configure_distros_image() | |||
| 286 | configure_save() | 263 | configure_save() |
| 287 | { | 264 | { |
| 288 | # save variables | 265 | # save variables |
| 289 | for STR in "CONFIG_PART_TYPE" "CONFIG_IMG_SIZE" "CONFIG_ISO_TYPE" "CONFIG_TLS_CHECK";do | 266 | for STR in "CONFIG_PART_TYPE" "CONFIG_IMG_SIZE" "CONFIG_TLS_CHECK";do |
| 290 | egrep "^${STR}=" "${CONFIG}.new" > /dev/null | 267 | egrep "^${STR}=" "${CONFIG}.new" > /dev/null |
| 291 | if test $? -ne 0;then | 268 | if test $? -ne 0;then |
| 292 | echo "${STR}=" >> "${CONFIG}.new" | 269 | echo "${STR}=" >> "${CONFIG}.new" |
| 293 | fi | 270 | fi |
| 294 | done | 271 | done |
| 295 | sed \ | 272 | sed \ |
| 296 | -e "s/^CONFIG_ISO_TYPE=.*$/CONFIG_ISO_TYPE=${CONFIG_ISO_TYPE}/g" \ | ||
| 297 | -e "s/^CONFIG_IMG_SIZE=.*$/CONFIG_IMG_SIZE=${CONFIG_IMG_SIZE}/g" \ | 273 | -e "s/^CONFIG_IMG_SIZE=.*$/CONFIG_IMG_SIZE=${CONFIG_IMG_SIZE}/g" \ |
| 298 | -e "s/^CONFIG_PART_TYPE=.*$/CONFIG_PART_TYPE=${CONFIG_PART_TYPE}/g" \ | 274 | -e "s/^CONFIG_PART_TYPE=.*$/CONFIG_PART_TYPE=${CONFIG_PART_TYPE}/g" \ |
| 299 | -e "s/^CONFIG_PART_SIZE=.*$/CONFIG_PART_SIZE=${CONFIG_PART_SIZE}/g" \ | 275 | -e "s/^CONFIG_PART_SIZE=.*$/CONFIG_PART_SIZE=${CONFIG_PART_SIZE}/g" \ |
| @@ -402,7 +378,6 @@ while test true;do | |||
| 402 | CONFIG_PART_TYPE="${DEFAULT_PART_TYPE}" | 378 | CONFIG_PART_TYPE="${DEFAULT_PART_TYPE}" |
| 403 | CONFIG_PART_SIZE="${DEFAULT_PART_SIZE}" | 379 | CONFIG_PART_SIZE="${DEFAULT_PART_SIZE}" |
| 404 | CONFIG_IMG_SIZE="${DEFAULT_IMG_SIZE}" | 380 | CONFIG_IMG_SIZE="${DEFAULT_IMG_SIZE}" |
| 405 | CONFIG_ISO_TYPE="${DEFAULT_ISO_TYPE}" | ||
| 406 | CONFIG_TLS_CHECK="${DEFAULT_TLS_CHECK}" | 381 | CONFIG_TLS_CHECK="${DEFAULT_TLS_CHECK}" |
| 407 | cat /dev/null > ${CONFIG}.new | 382 | cat /dev/null > ${CONFIG}.new |
| 408 | dialog \ | 383 | dialog \ |
diff --git a/src/scripts/genfiles.sh b/src/scripts/genfiles.sh index ed3b68a..f9cdecf 100755 --- a/src/scripts/genfiles.sh +++ b/src/scripts/genfiles.sh | |||
| @@ -91,7 +91,6 @@ generate_makefile_config() | |||
| 91 | rm -f ${BASEDIR}/Makefile.config | 91 | rm -f ${BASEDIR}/Makefile.config |
| 92 | { | 92 | { |
| 93 | # add configured options | 93 | # add configured options |
| 94 | echo "ISOTYPE ?= ${CONFIG_ISO_TYPE}" | ||
| 95 | echo "DISKSIZE ?= ${CONFIG_IMG_SIZE}" | 94 | echo "DISKSIZE ?= ${CONFIG_IMG_SIZE}" |
| 96 | echo "DISKTYPE ?= ${CONFIG_PART_TYPE}" | 95 | echo "DISKTYPE ?= ${CONFIG_PART_TYPE}" |
| 97 | echo "PARTSIZE ?= ${CONFIG_PART_SIZE}" | 96 | echo "PARTSIZE ?= ${CONFIG_PART_SIZE}" |
diff --git a/src/scripts/iperd.profile b/src/scripts/iperd.profile index 862b77d..7d768a9 100644 --- a/src/scripts/iperd.profile +++ b/src/scripts/iperd.profile | |||
| @@ -51,12 +51,10 @@ fi | |||
| 51 | DEFAULT_PART_TYPE="hybrid" | 51 | DEFAULT_PART_TYPE="hybrid" |
| 52 | DEFAULT_PART_SIZE="0" | 52 | DEFAULT_PART_SIZE="0" |
| 53 | DEFAULT_IMG_SIZE="1900" | 53 | DEFAULT_IMG_SIZE="1900" |
| 54 | DEFAULT_ISO_TYPE="bios" | ||
| 55 | DEFAULT_TLS_CHECK="yes" | 54 | DEFAULT_TLS_CHECK="yes" |
| 56 | CONFIG_PART_TYPE="${CONFIG_PART_TYPE:-${DEFAULT_PART_TYPE}}" | 55 | CONFIG_PART_TYPE="${CONFIG_PART_TYPE:-${DEFAULT_PART_TYPE}}" |
| 57 | CONFIG_PART_SIZE="${CONFIG_PART_SIZE:-${DEFAULT_PART_SIZE}}" | 56 | CONFIG_PART_SIZE="${CONFIG_PART_SIZE:-${DEFAULT_PART_SIZE}}" |
| 58 | CONFIG_IMG_SIZE="${CONFIG_IMG_SIZE:-${DEFAULT_IMG_SIZE}}" | 57 | CONFIG_IMG_SIZE="${CONFIG_IMG_SIZE:-${DEFAULT_IMG_SIZE}}" |
| 59 | CONFIG_ISO_TYPE="${CONFIG_ISO_TYPE:-${DEFAULT_ISO_TYPE}}" | ||
| 60 | CONFIG_TLS_CHECK="${CONFIG_TLS_CHECK:-${DEFAULT_TLS_CHECK}}" | 58 | CONFIG_TLS_CHECK="${CONFIG_TLS_CHECK:-${DEFAULT_TLS_CHECK}}" |
| 61 | 59 | ||
| 62 | 60 | ||
