Fix breakage due to incomplete removal of volume-group-name parameter.

diff --git a/_lib.sh b/_lib.sh
index 7f4bcc3c4ae75b4d664e4d6415dea476f05b571a..f9ca73b6ae33520d4865dfe2525a0b13aecc6f0c 100644 (file)
--- a/_lib.sh
+++ b/_lib.sh
@@ -69,7 +69,7 @@ check_new_luksvg() {
 }
 check_input_openable_luksvg() {
     local PARTITION=$1
-    check_input_new_luksvg
+    check_new_luksvg
     try_quiet cryptsetup isLuks "${PARTITION}"\
         || error "${PARTITION} not a LUKS container"
 }

diff --git a/chrooted_command.sh b/chrooted_command.sh
index 9b73d46b9bcf9cffac4e4a8a1d11c8f468559cde..3002bfde734c5a5e2ae2d2ff6b75c57a53e5ee92 100755 (executable)
--- a/chrooted_command.sh
+++ b/chrooted_command.sh
@@ -2,10 +2,10 @@
 . ./_lib.sh
 
 # inputs to confirm
-usage $# "partition" "volume-group-name" "root-name" "command"
+usage $# "partition" "root-name" "command"
 PARTITION=$1
-NAME_ROOT=$3
-COMMAND=$4
+NAME_ROOT=$2
+COMMAND=$3
 
 # constants derived from changeables
 PATH_VG_ROOT=$(path_vg "${NAME_LUKSVG}")/${NAME_ROOT}

diff --git a/install_debian.sh b/install_debian.sh
index f2f801f9585b6656317803cab3a36d76d2f9ffde..0867be49050203de04e6291cdf3b53c15eda4f19 100755 (executable)
--- a/install_debian.sh
+++ b/install_debian.sh
@@ -17,7 +17,7 @@ IDX_BOOT_PARTITION=1
 PATH_BOOT_DEVICE="${PATH_DEV}/nvme0n1"
 
 # inputs to confirm
-usage $# "partition" "volume-group-name" "boot-name"
+usage $# "partition" "boot-name"
 PARTITION=$1
 NAME_BOOT=$2
 NAME_ROOT="${NAME_BOOT}"
@@ -38,7 +38,7 @@ PATH_VG_SWAP=${PATH_VG}/${NAME_SWAP}
 check_tools cryptsetup debootstrap efibootmgr lvcreate mkfs.ext4 vgs
 check_input_partition_mountable "${PARTITION}"
 check_input_openable_luksvg "${PARTITION}"
-case "$1" in *[!A-Za-z0-9_.-]*|"")
+case "${NAME_BOOT}" in *[!A-Za-z0-9_.-]*|"")
     error "illegal characters in boot label '${NAME_BOOT}'" ;;
 esac
 [ -e "${PATH_EFI}/${NAME_BOOT}" ]\

diff --git a/setup_luksvg.sh b/setup_luksvg.sh
index 5071f6799d92950ef991a3ffa0f7f11f19e5a5be..8a651b4135d3710192ec622a098a5bc61f569bef 100755 (executable)
--- a/setup_luksvg.sh
+++ b/setup_luksvg.sh
@@ -2,7 +2,7 @@
 . ./_lib.sh
 
 # inputs to confirm
-usage $# "partition" "volume-group-name"
+usage $# "partition"
 PARTITION=$1
 
 # constants we might want to change at some point