diff --git a/usr/lib/archboot/installer/autoconfiguration.sh b/usr/lib/archboot/installer/autoconfiguration.sh index a38a7edef..dcc05561f 100644 --- a/usr/lib/archboot/installer/autoconfiguration.sh +++ b/usr/lib/archboot/installer/autoconfiguration.sh @@ -60,14 +60,14 @@ _auto_network() # copy iwd keys and enable iwd if grep -q 'wlan' /tmp/.network-interface; then cp -r /var/lib/iwd "${_DESTDIR}"/var/lib - chroot "${_DESTDIR}" systemctl enable iwd >"${_NO_LOG}">"${_NO_LOG}" + chroot "${_DESTDIR}" systemctl enable iwd &>"${_NO_LOG}" fi # copy network profiles if [[ -d ${_DESTDIR}/etc/systemd/network ]]; then # enable network profiles - cp /etc/systemd/network/* "${_DESTDIR}"/etc/systemd/network/ >"${_NO_LOG}">"${_NO_LOG}" - chroot "${_DESTDIR}" systemctl enable systemd-networkd >"${_NO_LOG}">"${_NO_LOG}" - chroot "${_DESTDIR}" systemctl enable systemd-resolved >"${_NO_LOG}">"${_NO_LOG}" + cp /etc/systemd/network/* "${_DESTDIR}"/etc/systemd/network/ &>"${_NO_LOG}" + chroot "${_DESTDIR}" systemctl enable systemd-networkd &>"${_NO_LOG}" + chroot "${_DESTDIR}" systemctl enable systemd-resolved &>"${_NO_LOG}" fi # copy proxy settings if [[ -n "${_PROXY}" ]]; then diff --git a/usr/lib/archboot/installer/autoprepare.sh b/usr/lib/archboot/installer/autoprepare.sh index acf92f707..abe17af52 100644 --- a/usr/lib/archboot/installer/autoprepare.sh +++ b/usr/lib/archboot/installer/autoprepare.sh @@ -53,14 +53,14 @@ _autoprepare() { fi while [[ -z "${_DEFAULTFS}" ]]; do _FSOPTS="" - command -v mkfs.btrfs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs" - command -v mkfs.ext4 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext4 Ext4" - command -v mkfs.ext3 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext3 Ext3" - command -v mkfs.ext2 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2" - command -v mkfs.xfs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} xfs XFS" - command -v mkfs.f2fs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS" - command -v mkfs.nilfs2 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} nilfs2 Nilfs2" - command -v mkfs.jfs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} jfs JFS" + command -v mkfs.btrfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs" + command -v mkfs.ext4 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext4 Ext4" + command -v mkfs.ext3 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext3 Ext3" + command -v mkfs.ext2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2" + command -v mkfs.xfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} xfs XFS" + command -v mkfs.f2fs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS" + command -v mkfs.nilfs2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} nilfs2 Nilfs2" + command -v mkfs.jfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} jfs JFS" # create 1 MB bios_grub partition for grub BIOS GPT support if [[ -n "${_GUIDPARAMETER}" ]]; then _GPT_BIOS_GRUB_DEV_SIZE="2" @@ -196,12 +196,12 @@ _autoprepare() { _printk off _dialog --infobox "Partitioning ${_DISK} ..." 0 0 # clean partition table to avoid issues! - sgdisk --zap "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + sgdisk --zap "${_DISK}" &>"${_NO_LOG}" # clear all magic strings/signatures - mdadm, lvm, partition tables etc. - dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}">"${_NO_LOG}" - wipefs -a "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + dd if=/dev/zero of="${_DISK}" bs=512 count=2048 &>"${_NO_LOG}" + wipefs -a "${_DISK}" &>"${_NO_LOG}" # create fresh GPT - sgdisk --clear "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + sgdisk --clear "${_DISK}" &>"${_NO_LOG}" # create actual partitions sgdisk --new="${_GPT_BIOS_GRUB_DEV_NUM}":0:+"${_GPT_BIOS_GRUB_DEV_SIZE}"M --typecode="${_GPT_BIOS_GRUB_DEV_NUM}":EF02 --change-name="${_GPT_BIOS_GRUB_DEV_NUM}":BIOS_GRUB "${_DISK}" >"${_LOG}" sgdisk --new="${_UEFISYSDEV_NUM}":0:+"${_UEFISYSDEV_SIZE}"M --typecode="${_UEFISYSDEV_NUM}":EF00 --change-name="${_UEFISYSDEV_NUM}":UEFI_SYSTEM "${_DISK}" >"${_LOG}" @@ -223,10 +223,10 @@ _autoprepare() { _printk off _dialog --infobox "Partitioning ${_DISK}" 0 0 # clean partitiontable to avoid issues! - dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}">"${_NO_LOG}" - wipefs -a "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + dd if=/dev/zero of="${_DISK}" bs=512 count=2048 &>"${_NO_LOG}" + wipefs -a "${_DISK}" &>"${_NO_LOG}" # create DOS MBR with parted - parted -a optimal -s "${_DISK}" unit MiB mktable msdos >"${_NO_LOG}">"${_NO_LOG}" + parted -a optimal -s "${_DISK}" unit MiB mktable msdos &>"${_NO_LOG}" parted -a optimal -s "${_DISK}" unit MiB mkpart primary 1 $((_BOOTDEV_SIZE)) >"${_LOG}" parted -a optimal -s "${_DISK}" unit MiB set 1 boot on >"${_LOG}" parted -a optimal -s "${_DISK}" unit MiB mkpart primary $((_BOOTDEV_SIZE)) $((_BOOTDEV_SIZE+_SWAPDEV_SIZE)) >"${_LOG}" diff --git a/usr/lib/archboot/installer/base.sh b/usr/lib/archboot/installer/base.sh index 23de9aa2a..edf348b1f 100644 --- a/usr/lib/archboot/installer/base.sh +++ b/usr/lib/archboot/installer/base.sh @@ -10,7 +10,7 @@ else _DESTDIR="/" fi _NO_LOG="/dev/null" -if pgrep -x Xorg >"${_NO_LOG}">"${_NO_LOG}"; then +if pgrep -x Xorg &>"${_NO_LOG}"; then _LOG="/dev/tty8" else _LOG="/dev/tty7" diff --git a/usr/lib/archboot/installer/blockdevices.sh b/usr/lib/archboot/installer/blockdevices.sh index ab1e845e9..71cac274d 100644 --- a/usr/lib/archboot/installer/blockdevices.sh +++ b/usr/lib/archboot/installer/blockdevices.sh @@ -200,9 +200,9 @@ _activate_lvm2() _OLD_LVM2_GROUPS=${_LVM2_GROUPS} _OLD_LVM2_VOLUMES=${_LVM2_VOLUMES} _dialog --infobox "Scanning logical volumes..." 0 0 - lvm vgscan --ignorelockingfailure >"${_NO_LOG}">"${_NO_LOG}" + lvm vgscan --ignorelockingfailure &>"${_NO_LOG}" _dialog --infobox "Activating logical volumes..." 0 0 - lvm vgchange --ignorelockingfailure --ignoremonitoring -ay >"${_NO_LOG}">"${_NO_LOG}" + lvm vgchange --ignorelockingfailure --ignoremonitoring -ay &>"${_NO_LOG}" _LVM2_GROUPS="$(vgs -o vg_name --noheading 2>/dev/null)" _LVM2_VOLUMES="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)" [[ "${_OLD_LVM2_GROUPS}" == "${_LVM2_GROUPS}" && "${_OLD_LVM2_VOLUMES}" == "${_LVM2_VOLUMES}" ]] && _LVM2_READY="1" @@ -214,7 +214,7 @@ _activate_md() _RAID_READY="" if [[ -e /usr/bin/mdadm ]]; then _dialog --infobox "Activating RAID arrays..." 0 0 - mdadm --assemble --scan >"${_NO_LOG}">"${_NO_LOG}" || _RAID_READY="1" + mdadm --assemble --scan &>"${_NO_LOG}" || _RAID_READY="1" fi } @@ -300,7 +300,7 @@ _getavailpartitions() _umountall() { if [[ "${_DESTDIR}" == "/install" ]] && mountpoint -q "${_DESTDIR}"; then - swapoff -a >"${_NO_LOG}">"${_NO_LOG}" + swapoff -a &>"${_NO_LOG}" for i in $(findmnt --list --submounts "${_DESTDIR}" -o TARGET -n | tac); do umount "$i" done diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh index d2e3e5b05..72fe72b30 100644 --- a/usr/lib/archboot/installer/bootloader.sh +++ b/usr/lib/archboot/installer/bootloader.sh @@ -70,12 +70,12 @@ _freeze_xfs() { sync if [[ -x /usr/bin/xfs_freeze ]]; then if grep -q "${_DESTDIR}/boot " /proc/mounts | grep -q " xfs "; then - xfs_freeze -f "${_DESTDIR}"/boot >"${_NO_LOG}">"${_NO_LOG}" - xfs_freeze -u "${_DESTDIR}"/boot >"${_NO_LOG}">"${_NO_LOG}" + xfs_freeze -f "${_DESTDIR}"/boot &>"${_NO_LOG}" + xfs_freeze -u "${_DESTDIR}"/boot &>"${_NO_LOG}" fi if grep -q "${_DESTDIR} " /proc/mounts | grep -q " xfs "; then - xfs_freeze -f "${_DESTDIR}" >"${_NO_LOG}">"${_NO_LOG}" - xfs_freeze -u "${_DESTDIR}" >"${_NO_LOG}">"${_NO_LOG}" + xfs_freeze -f "${_DESTDIR}" &>"${_NO_LOG}" + xfs_freeze -u "${_DESTDIR}" &>"${_NO_LOG}" fi fi } @@ -387,9 +387,9 @@ CONFEOF echo "ExecStart=/usr/bin/cp -f /boot/${_INTEL_UCODE} ${_UEFISYS_MP}/${_INITRD_INTEL_UCODE}" \ >> "${_DESTDIR}/etc/systemd/system/efistub_copy.service" if [[ "${_DESTDIR}" == "/install" ]]; then - systemd-nspawn -q -D "${_DESTDIR}" systemctl enable efistub_copy.path >"${_NO_LOG}">"${_NO_LOG}" + systemd-nspawn -q -D "${_DESTDIR}" systemctl enable efistub_copy.path &>"${_NO_LOG}" else - systemctl enable efistub_copy.path >"${_NO_LOG}">"${_NO_LOG}" + systemctl enable efistub_copy.path &>"${_NO_LOG}" fi sleep 5 fi diff --git a/usr/lib/archboot/installer/btrfs.sh b/usr/lib/archboot/installer/btrfs.sh index d1216e7f4..d19e47531 100644 --- a/usr/lib/archboot/installer/btrfs.sh +++ b/usr/lib/archboot/installer/btrfs.sh @@ -2,7 +2,7 @@ # created by Tobias Powalowski # scan and update btrfs devices _btrfs_scan() { - btrfs device scan >"${_NO_LOG}">"${_NO_LOG}" + btrfs device scan &>"${_NO_LOG}" } # mount btrfs for checks diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh index d1aeee44b..4a3382c20 100644 --- a/usr/lib/archboot/installer/common.sh +++ b/usr/lib/archboot/installer/common.sh @@ -148,8 +148,8 @@ _auto_packages() { # enable at least C.UTF-8 if nothing was changed, else weird things happen on reboot! _locale_gen() { if [[ "${_DESTDIR}" == "/install" ]]; then - systemd-nspawn -q -D "${_DESTDIR}" locale-gen >"${_NO_LOG}">"${_NO_LOG}" + systemd-nspawn -q -D "${_DESTDIR}" locale-gen &>"${_NO_LOG}" else - locale-gen >"${_NO_LOG}">"${_NO_LOG}" + locale-gen &>"${_NO_LOG}" fi } diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh index 1e58e5118..1a64219eb 100644 --- a/usr/lib/archboot/installer/configuration.sh +++ b/usr/lib/archboot/installer/configuration.sh @@ -78,7 +78,7 @@ _set_password() { _PASS2="" fi done - chroot "${_DESTDIR}" passwd root < /tmp/.password >"${_NO_LOG}">"${_NO_LOG}" + chroot "${_DESTDIR}" passwd root < /tmp/.password &>"${_NO_LOG}" rm /tmp/.password } @@ -87,9 +87,9 @@ _run_mkinitcpio() { _chroot_mount echo "Initramfs progress ..." > /tmp/mkinitcpio.log if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then - chroot "${_DESTDIR}" mkinitcpio -p "${_KERNELPKG}"-"${_RUNNING_ARCH}" |& tee -a "${_LOG}" /tmp/mkinitcpio.log >"${_NO_LOG}">"${_NO_LOG}" + chroot "${_DESTDIR}" mkinitcpio -p "${_KERNELPKG}"-"${_RUNNING_ARCH}" |& tee -a "${_LOG}" /tmp/mkinitcpio.log &>"${_NO_LOG}" else - chroot "${_DESTDIR}" mkinitcpio -p "${_KERNELPKG}" |& tee -a "${_LOG}" /tmp/mkinitcpio.log >"${_NO_LOG}">"${_NO_LOG}" + chroot "${_DESTDIR}" mkinitcpio -p "${_KERNELPKG}" |& tee -a "${_LOG}" /tmp/mkinitcpio.log &>"${_NO_LOG}" fi echo $? > /tmp/.mkinitcpio-retcode if [[ $(cat /tmp/.mkinitcpio-retcode) -ne 0 ]]; then diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh index e970aee61..fc66dc2fa 100644 --- a/usr/lib/archboot/installer/mountpoints.sh +++ b/usr/lib/archboot/installer/mountpoints.sh @@ -46,15 +46,15 @@ _ssd_optimization() { _select_filesystem() { # don't allow vfat as / filesystem, it will not work! _FSOPTS="" - command -v mkfs.btrfs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs" - command -v mkfs.ext4 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext4 Ext4" - command -v mkfs.ext3 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext3 Ext3" - command -v mkfs.ext2 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2" - command -v mkfs.vfat >"${_NO_LOG}">"${_NO_LOG}" && [[ -z "${_DO_ROOT}" ]] && _FSOPTS="${_FSOPTS} vfat FAT32" - command -v mkfs.xfs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} xfs XFS" - command -v mkfs.f2fs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS" - command -v mkfs.nilfs2 >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} nilfs2 Nilfs2" - command -v mkfs.jfs >"${_NO_LOG}">"${_NO_LOG}" && _FSOPTS="${_FSOPTS} jfs JFS" + command -v mkfs.btrfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} btrfs Btrfs" + command -v mkfs.ext4 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext4 Ext4" + command -v mkfs.ext3 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext3 Ext3" + command -v mkfs.ext2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} ext2 Ext2" + command -v mkfs.vfat &>"${_NO_LOG}" && [[ -z "${_DO_ROOT}" ]] && _FSOPTS="${_FSOPTS} vfat FAT32" + command -v mkfs.xfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} xfs XFS" + command -v mkfs.f2fs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} f2fs F2FS" + command -v mkfs.nilfs2 &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} nilfs2 Nilfs2" + command -v mkfs.jfs &>"${_NO_LOG}" && _FSOPTS="${_FSOPTS} jfs JFS" #shellcheck disable=SC2086 _dialog --menu "Select a filesystem for ${_DEV}:" 16 50 13 ${_FSOPTS} 2>"${_ANSWER}" || return 1 _FSTYPE=$(cat "${_ANSWER}") @@ -246,7 +246,7 @@ _mkfs() { # add btrfs raid level, if needed # we have two main cases: "swap" and everything else. if [[ "${2}" == "swap" ]]; then - swapoff "${1}" >"${_NO_LOG}">"${_NO_LOG}" + swapoff "${1}" &>"${_NO_LOG}" if [[ -n "${4}" ]]; then mkswap -L "${6}" "${1}" >"${_LOG}" 2>&1 #shellcheck disable=SC2181 diff --git a/usr/lib/archboot/installer/network.sh b/usr/lib/archboot/installer/network.sh index 0375b252a..d0b5c65b1 100644 --- a/usr/lib/archboot/installer/network.sh +++ b/usr/lib/archboot/installer/network.sh @@ -27,9 +27,9 @@ _do_wireless() { _WLAN_AUTH="" if [[ "${_CONNECTION}" == "wireless" ]]; then # disconnect the interface first! - iwctl station "${_INTERFACE}" disconnect >"${_NO_LOG}">"${_NO_LOG}" + iwctl station "${_INTERFACE}" disconnect &>"${_NO_LOG}" # clean old keys first! - rm -f /var/lib/iwd/* >"${_NO_LOG}">"${_NO_LOG}" + rm -f /var/lib/iwd/* &>"${_NO_LOG}" #shellcheck disable=SC2086,SC2046 _dialog --menu "Choose your SSID:\n(Empty spaces in your SSID are replaced by '+' char)" 14 60 7 \ $(_essid_scan _) \ @@ -58,9 +58,9 @@ _do_wireless() { _dialog --infobox "Connection to SSID='${_WLAN_SSID}' with interface ${_INTERFACE} ..." 3 70 _printk off if [[ -z "${_WLAN_KEY}" ]]; then - iwctl station "${_INTERFACE}" "${_WLAN_CONNECT}" "${_WLAN_SSID}" >"${_NO_LOG}">"${_NO_LOG}" && _WLAN_AUTH=1 + iwctl station "${_INTERFACE}" "${_WLAN_CONNECT}" "${_WLAN_SSID}" &>"${_NO_LOG}" && _WLAN_AUTH=1 else - iwctl --passphrase="${_WLAN_KEY}" station "${_INTERFACE}" "${_WLAN_CONNECT}" "${_WLAN_SSID}" >"${_NO_LOG}">"${_NO_LOG}" && _WLAN_AUTH=1 + iwctl --passphrase="${_WLAN_KEY}" station "${_INTERFACE}" "${_WLAN_CONNECT}" "${_WLAN_SSID}" &>"${_NO_LOG}" && _WLAN_AUTH=1 fi if [[ -n "${_WLAN_AUTH}" ]]; then _dialog --infobox "Authentification successfull. Continuing in 3 seconds ..." 3 70 diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh index ce0375c41..748331eba 100644 --- a/usr/lib/archboot/installer/pacman.sh +++ b/usr/lib/archboot/installer/pacman.sh @@ -107,11 +107,11 @@ _prepare_pacman() { [[ ! -d "${_DESTDIR}/var/lib/pacman" ]] && mkdir -p "${_DESTDIR}/var/lib/pacman" _dialog --infobox "Waiting for Arch Linux keyring initialization ..." 3 40 # pacman-key process itself - while pgrep -x pacman-key >"${_NO_LOG}">"${_NO_LOG}"; do + while pgrep -x pacman-key &>"${_NO_LOG}"; do sleep 1 done # gpg finished in background - while pgrep -x gpg >"${_NO_LOG}">"${_NO_LOG}"; do + while pgrep -x gpg &>"${_NO_LOG}"; do sleep 1 done [[ -e /etc/systemd/system/pacman-init.service ]] && systemctl stop pacman-init.service @@ -130,7 +130,7 @@ _run_pacman(){ echo "Installing Packages ..." >/tmp/pacman.log sleep 5 #shellcheck disable=SC2086,SC2069 - ${_PACMAN} -S ${_PACKAGES} |& tee -a "${_LOG}" /tmp/pacman.log >"${_NO_LOG}">"${_NO_LOG}" + ${_PACMAN} -S ${_PACKAGES} |& tee -a "${_LOG}" /tmp/pacman.log &>"${_NO_LOG}" echo $? > /tmp/.pacman-retcode if [[ $(cat /tmp/.pacman-retcode) -ne 0 ]]; then echo -e "\nPackage Installation FAILED." >>/tmp/pacman.log diff --git a/usr/lib/archboot/installer/partition.sh b/usr/lib/archboot/installer/partition.sh index 35ffb24c1..0f6fbdf91 100644 --- a/usr/lib/archboot/installer/partition.sh +++ b/usr/lib/archboot/installer/partition.sh @@ -20,12 +20,12 @@ _check_gpt() { 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 # clean partition table to avoid issues! - sgdisk --zap "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + sgdisk --zap "${_DISK}" &>"${_NO_LOG}" # clear all magic strings/signatures - mdadm, lvm, partition tables etc. - dd if=/dev/zero of="${_DISK}" bs=512 count=2048 >"${_NO_LOG}">"${_NO_LOG}" - wipefs -a "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + dd if=/dev/zero of="${_DISK}" bs=512 count=2048 &>"${_NO_LOG}" + wipefs -a "${_DISK}" &>"${_NO_LOG}" # create fresh GPT - sgdisk --clear "${_DISK}" >"${_NO_LOG}">"${_NO_LOG}" + sgdisk --clear "${_DISK}" &>"${_NO_LOG}" _GUID_DETECTED=1 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 _UEFISYS_MP="$(cat "${_ANSWER}")" fi - umount "${_DESTDIR}/${_UEFISYS_MP}" >"${_NO_LOG}">"${_NO_LOG}" - umount "${_UEFISYSDEV}" >"${_NO_LOG}">"${_NO_LOG}" + umount "${_DESTDIR}/${_UEFISYS_MP}" &>"${_NO_LOG}" + umount "${_UEFISYSDEV}" &>"${_NO_LOG}" if [[ -n "${_FORMAT_UEFISYS_FAT32}" ]]; then mkfs.vfat -F32 -n "EFISYS" "${_UEFISYSDEV}" fi @@ -141,8 +141,8 @@ _partition() { if [[ -z "${_MSDOS_DETECTED}" ]]; then _dialog --defaultno --yesno "Setup detected no MS-DOS partition table on ${_DISK}.\nDo you want to create a MS-DOS partition table now on ${_DISK}?\n\n${_DISK} will be COMPLETELY ERASED! Are you absolutely sure?" 0 0 || return 1 # clean partitiontable to avoid issues! - dd if=/dev/zero of="${_DEV}" bs=512 count=2048 >"${_NO_LOG}">"${_NO_LOG}" - wipefs -a "${_DEV}" >"${_NO_LOG}">"${_NO_LOG}" + dd if=/dev/zero of="${_DEV}" bs=512 count=2048 &>"${_NO_LOG}" + wipefs -a "${_DEV}" &>"${_NO_LOG}" parted -a optimal -s "${_DISK}" mktable msdos >"${_LOG}" fi # Partition disc