summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-28 23:20:50 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-28 23:20:50 -0200
commit7c9550186ad1343348045d52ade777da3b0d267f (patch)
tree380850a3f647fe9e293f0358e4f5198fcb7b17c5
parente22c810fb82d5411634b6cf8015a4e8ed76b629d (diff)
downloadhydra-7c9550186ad1343348045d52ade777da3b0d267f.tar.gz
hydra-7c9550186ad1343348045d52ade777da3b0d267f.tar.bz2
Doing a vgdisplay instead of sleep; saner defaults
-rwxr-xr-xshare/hydractl/provision10
1 files changed, 5 insertions, 5 deletions
diff --git a/share/hydractl/provision b/share/hydractl/provision
index 07d1435..a445942 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -76,9 +76,9 @@ function hydra_create_volume {
# Setup.
hydra_user_input device /dev/sdb "Destination device"
hydra_user_input root_size 20G "Size of root partition"
-hydra_user_input swap_size 0 "Swap size (in MB, 0 to not create it)"
-hydra_user_input home_size 0 "Size of home partition (0 to not create it, -1 for all free space)"
-hydra_user_input var_size 0 "Size of var partition (0 to not create it, -1 for all free space)"
+hydra_user_input swap_size 2000 "Swap size (in MB, 0 to not create it)"
+hydra_user_input home_size 20G "Size of home partition (0 to not create it, -1 for all free space)"
+hydra_user_input var_size 20G "Size of var partition (0 to not create it, -1 for all free space)"
hydra_user_input encrypt y "Encrypt volumes? (y/n)"
hydra_user_input garbage y "Pre-fill volumes with garbage? (y/n)"
hydra_user_input hostname $HOSTNAME "Hostname"
@@ -86,7 +86,7 @@ hydra_user_input domain example.com "Domain"
hydra_user_input arch amd64 "System arch"
hydra_user_input version wheezy "Distro version"
hydra_user_input vg vg "Temporary install vg"
-hydra_user_input grub n "Setup GRUB? (y/n)"
+hydra_user_input grub y "Setup GRUB? (y/n)"
hydra_user_input mirror http://http.debian.net/debian/ "Debian mirror"
# Check for requirements.
@@ -140,7 +140,7 @@ if ! vgdisplay $vg &> /dev/null; then
hydra_safe_run vgcreate $vg $syst_device
fi
-sleep 5
+hydra_safe_run vgdisplay
hydra_safe_run vgchange -a y $vg
hydra_lvcreate root $root_size
hydra_lvcreate home $home_size