mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
replace &> /dev/null and &>/dev/null with >${_NO_LOG}
This commit is contained in:
parent
8da910b387
commit
ea85b0a049
2 changed files with 11 additions and 11 deletions
|
@ -200,12 +200,12 @@ _autoprepare() {
|
||||||
_printk off
|
_printk off
|
||||||
_dialog --infobox "Partitioning ${_DISK} ..." 0 0
|
_dialog --infobox "Partitioning ${_DISK} ..." 0 0
|
||||||
# clean partition table to avoid issues!
|
# clean partition table to avoid issues!
|
||||||
sgdisk --zap "${_DISK}" &>/dev/null
|
sgdisk --zap "${_DISK}" >"${_NO_LOG}"
|
||||||
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
|
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
|
||||||
dd if=/dev/zero of="${_DISK}" bs=512 count=2048 &>/dev/null
|
dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}"
|
||||||
wipefs -a "${_DISK}" &>/dev/null
|
wipefs -a "${_DISK}" >"${_NO_LOG}"
|
||||||
# create fresh GPT
|
# create fresh GPT
|
||||||
sgdisk --clear "${_DISK}" &>/dev/null
|
sgdisk --clear "${_DISK}" >"${_NO_LOG}"
|
||||||
# create actual partitions
|
# create actual partitions
|
||||||
sgdisk --set-alignment="2048" --new="${_GPT_BIOS_GRUB_DEVICE_NUM}":0:+"${_GPT_BIOS_GRUB_DEVICE_SIZE}"M --typecode="${_GPT_BIOS_GRUB_DEVICE_NUM}":EF02 --change-name="${_GPT_BIOS_GRUB_DEVICE_NUM}":BIOS_GRUB "${_DISK}" > "${_LOG}"
|
sgdisk --set-alignment="2048" --new="${_GPT_BIOS_GRUB_DEVICE_NUM}":0:+"${_GPT_BIOS_GRUB_DEVICE_SIZE}"M --typecode="${_GPT_BIOS_GRUB_DEVICE_NUM}":EF02 --change-name="${_GPT_BIOS_GRUB_DEVICE_NUM}":BIOS_GRUB "${_DISK}" > "${_LOG}"
|
||||||
sgdisk --set-alignment="2048" --new="${_UEFISYS_DEVICE_NUM}":0:+"${_UEFISYS_DEVICE_SIZE}"M --typecode="${_UEFISYS_DEVICE_NUM}":EF00 --change-name="${_UEFISYS_DEVICE_NUM}":UEFI_SYSTEM "${_DISK}" > "${_LOG}"
|
sgdisk --set-alignment="2048" --new="${_UEFISYS_DEVICE_NUM}":0:+"${_UEFISYS_DEVICE_SIZE}"M --typecode="${_UEFISYS_DEVICE_NUM}":EF00 --change-name="${_UEFISYS_DEVICE_NUM}":UEFI_SYSTEM "${_DISK}" > "${_LOG}"
|
||||||
|
@ -228,7 +228,7 @@ _autoprepare() {
|
||||||
_dialog --infobox "Partitioning ${_DISK}" 0 0
|
_dialog --infobox "Partitioning ${_DISK}" 0 0
|
||||||
# clean partitiontable to avoid issues!
|
# clean partitiontable to avoid issues!
|
||||||
dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}"
|
dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}"
|
||||||
wipefs -a "${_DISK}" &>/dev/null
|
wipefs -a "${_DISK}" >"${_NO_LOG}"
|
||||||
# create DOS MBR with parted
|
# create DOS MBR with parted
|
||||||
parted -a optimal -s "${_DISK}" unit MiB mktable msdos >"${_NO_LOG}"
|
parted -a optimal -s "${_DISK}" unit MiB mktable msdos >"${_NO_LOG}"
|
||||||
parted -a optimal -s "${_DISK}" unit MiB mkpart primary 1 $((_GUID_DEVICE_SIZE+_BOOT_DEVICE_SIZE)) >"${_LOG}"
|
parted -a optimal -s "${_DISK}" unit MiB mkpart primary 1 $((_GUID_DEVICE_SIZE+_BOOT_DEVICE_SIZE)) >"${_LOG}"
|
||||||
|
|
|
@ -20,12 +20,12 @@ _check_gpt() {
|
||||||
if [[ -z "${_GUID_DETECTED}" ]]; then
|
if [[ -z "${_GUID_DETECTED}" ]]; then
|
||||||
_dialog --defaultno --yesno "Conversion failed on ${_DISK}.\nSetup detected no GUID (gpt) partition table on ${_DISK}.\n\nDo you want to create a new GUID (gpt) table now on ${_DISK}?\n\n${_DISK} will be COMPLETELY ERASED! Are you absolutely sure?" 0 0 || return 1
|
_dialog --defaultno --yesno "Conversion failed on ${_DISK}.\nSetup detected no GUID (gpt) partition table on ${_DISK}.\n\nDo you want to create a new GUID (gpt) table now on ${_DISK}?\n\n${_DISK} will be COMPLETELY ERASED! Are you absolutely sure?" 0 0 || return 1
|
||||||
# clean partition table to avoid issues!
|
# clean partition table to avoid issues!
|
||||||
sgdisk --zap "${_DISK}" &>/dev/null
|
sgdisk --zap "${_DISK}" >"${_NO_LOG}"
|
||||||
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
|
# clear all magic strings/signatures - mdadm, lvm, partition tables etc.
|
||||||
dd if=/dev/zero of="${_DISK}" bs=512 count=2048 &>/dev/null
|
dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}"
|
||||||
wipefs -a "${_DISK}" &>/dev/null
|
wipefs -a "${_DISK}" >"${_NO_LOG}"
|
||||||
# create fresh GPT
|
# create fresh GPT
|
||||||
sgdisk --clear "${_DISK}" &>/dev/null
|
sgdisk --clear "${_DISK}" >"${_NO_LOG}"
|
||||||
_GUID_DETECTED=1
|
_GUID_DETECTED=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -86,8 +86,8 @@ _check_efisys_part() {
|
||||||
_dialog --inputbox "Enter the mountpoint of your EFI System partition (Default is /boot): " 0 0 "/boot" 2>"${_ANSWER}" || return 1
|
_dialog --inputbox "Enter the mountpoint of your EFI System partition (Default is /boot): " 0 0 "/boot" 2>"${_ANSWER}" || return 1
|
||||||
_UEFISYS_MP="$(cat "${_ANSWER}")"
|
_UEFISYS_MP="$(cat "${_ANSWER}")"
|
||||||
fi
|
fi
|
||||||
umount "${_DESTDIR}/${_UEFISYS_MP}" &> /dev/null
|
umount "${_DESTDIR}/${_UEFISYS_MP}" >"${_NO_LOG}"
|
||||||
umount "${_UEFISYS_DEVICE}" &> /dev/null
|
umount "${_UEFISYS_DEVICE}" >"${_NO_LOG}"
|
||||||
if [[ -n "${_FORMAT_UEFISYS_FAT32}" ]]; then
|
if [[ -n "${_FORMAT_UEFISYS_FAT32}" ]]; then
|
||||||
mkfs.vfat -F32 -n "EFISYS" "${_UEFISYS_DEVICE}"
|
mkfs.vfat -F32 -n "EFISYS" "${_UEFISYS_DEVICE}"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue