aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2021-02-25 19:22:26 -0300
committerSilvio Rhatto <rhatto@riseup.net>2021-02-25 19:22:26 -0300
commite4d4160f0fdae532d0e2bf8a43426e6840300f3c (patch)
treedaec333e798f4613de110bb59ec9caf860969923
parent9a4fd039c1206fb79b9b4f098fe4e34474e1907d (diff)
downloadhydra-e4d4160f0fdae532d0e2bf8a43426e6840300f3c.tar.gz
hydra-e4d4160f0fdae532d0e2bf8a43426e6840300f3c.tar.bz2
Fix: cryptsetup and parted issues
-rwxr-xr-xshare/hydractl/provision10
1 files changed, 7 insertions, 3 deletions
diff --git a/share/hydractl/provision b/share/hydractl/provision
index 5766c52..2793e11 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -51,7 +51,11 @@ function hydra_provision_lvcreate {
# Cryptsetup wrapper.
function hydra_cryptsetup {
if [ ! -z "$1" ] && [ -b "$1" ]; then
- hydra_sudo_run cryptsetup --cipher aes-xts-plain64:sha256 --key-size 512 --hash sha512 --iter-time 5000 --use-random -y -q luksFormat $1
+ # Run cryptsetup with custom parameters
+ #hydra_sudo_run cryptsetup --cipher aes-xts-plain64:sha256 --key-size 512 --hash sha512 --iter-time 5000 --use-random -y -q luksFormat $1
+
+ # Run cryptsetup mostly with defaults
+ hydra_sudo_run cryptsetup --use-random -y -q luksFormat $1
fi
}
@@ -230,9 +234,9 @@ else
# https://bugs.launchpad.net/ubuntu/+source/parted/+bug/1270203
# https://techtitbits.com/2018/12/using-parteds-resizepart-non-interactively-on-a-busy-partition/
# https://serverfault.com/questions/870594/resize-partition-to-maximum-using-parted-in-non-interactive-mode
- #hydra_sudo_run parted -s -- $device mkpart non-fs ${start}s ${bios_grub_end}s
+ hydra_sudo_run parted -s -- $device mkpart non-fs ${start}s ${bios_grub_end}s
#hydra_sudo_run parted -s ---pretend-input-tty -- $device mkpart non-fs ${start}s ${bios_grub_end}s Yes
- hydra_sudo_run parted $device mkpart non-fs ${start}s ${bios_grub_end}s Yes Ignore quit
+ #hydra_sudo_run parted $device mkpart non-fs ${start}s ${bios_grub_end}s Yes Ignore quit
#hydra_sudo_run parted -s ---pretend-input-tty $device <<EOF
#mkpart non-fs ${start}s ${bios_grub_end}s
#Yes