Minor code consistency fixes.

diff --git a/_lib.sh b/_lib.sh
index 26dde067485a74c7e3b070ddc0c5a7b2c6c4e601..c7002c6e212344bbac9f28407bc41fba16cf7976 100644 (file)
--- a/_lib.sh
+++ b/_lib.sh
@@ -22,7 +22,7 @@ path_vg() {
     printf '%s/%s' "${PATH_DEV}" "$1"
 }
 
     printf '%s/%s' "${PATH_DEV}" "$1"
 }
 

-# helpers: logging, testing, failing basics 
+# helpers: logging, testing, failing basics

 msg_nonl() {
     printf '[## %s ##] ' "${SCRIPT_NAME}"
     # shellcheck disable=SC2059
 msg_nonl() {
     printf '[## %s ##] ' "${SCRIPT_NAME}"
     # shellcheck disable=SC2059


@@ -44,7 +44,7 @@ try_quiet() {
     "$@" >/dev/null 2>&1
 }
 
     "$@" >/dev/null 2>&1
 }
 

-# helpers: more involved testing 
+# helpers: more involved testing

 check_tools() {
     for CMD in "$@"; do
         try_quiet command -v "${CMD}"\
 check_tools() {
     for CMD in "$@"; do
         try_quiet command -v "${CMD}"\


@@ -76,18 +76,18 @@ check_input_openable_luksvg() {
 }
 
 # helpers: luks open/close
 }
 
 # helpers: luks open/close

-open_luksvg () {
+open_luksvg() {

     local PARTITION=$1
     msg 'Opening LUKS container as "%s" …' "${NAME_LUKSVG}"
     cryptsetup luksOpen "${PARTITION}" "${NAME_LUKSVG}"
 }
     local PARTITION=$1
     msg 'Opening LUKS container as "%s" …' "${NAME_LUKSVG}"
     cryptsetup luksOpen "${PARTITION}" "${NAME_LUKSVG}"
 }

-close_luksvg () {
+close_luksvg() {

     msg 'Deactivating volume group and closing LUKS container …'
     vgchange -an "${NAME_LUKSVG}"
     cryptsetup luksClose "${NAME_LUKSVG}"
 }
 
     msg 'Deactivating volume group and closing LUKS container …'
     vgchange -an "${NAME_LUKSVG}"
     cryptsetup luksClose "${NAME_LUKSVG}"
 }
 

-# helpers: mount/unmount root 
+# helpers: mount/unmount root

 mount_privately() {
     local TO_MOUNT=$1
     local DEST=$2
 mount_privately() {
     local TO_MOUNT=$1
     local DEST=$2

diff --git a/chrooted_command.sh b/chrooted_command.sh
index 8e0033ad902d20253dd8199feba752eda933350a..9c1f74f162b378d04114963b48fd74db17e2295e 100755 (executable)
--- a/chrooted_command.sh
+++ b/chrooted_command.sh
@@ -11,7 +11,7 @@ COMMAND=$3
 PATH_VG_ROOT=$(path_vg "${NAME_LUKSVG}")/${NAME_ROOT}
 
 # sanity checks
 PATH_VG_ROOT=$(path_vg "${NAME_LUKSVG}")/${NAME_ROOT}
 
 # sanity checks

-check_tools cryptsetup vgs
+check_tools cryptsetup vgchange vgs

 check_input_partition_mountable "${PARTITION}"
 check_input_openable_luksvg "${PARTITION}"
 
 check_input_partition_mountable "${PARTITION}"
 check_input_openable_luksvg "${PARTITION}"
 

diff --git a/install_debian.sh b/install_debian.sh
index 6dce243bf18ea808e0b6fe0855237163574c311f..a8a3330ff0687922fad7583346cfd9bbaafd68d9 100755 (executable)
--- a/install_debian.sh
+++ b/install_debian.sh
@@ -35,7 +35,7 @@ PATH_VG_ROOT=${PATH_VG}/${NAME_ROOT}
 PATH_VG_SWAP=${PATH_VG}/${NAME_SWAP}
 
 # sanity checks
 PATH_VG_SWAP=${PATH_VG}/${NAME_SWAP}
 
 # sanity checks

-check_tools cryptsetup debootstrap efibootmgr lvcreate mkfs.ext4 vgs
+check_tools cryptsetup debootstrap efibootmgr lvcreate mkfs.ext4 vgchange vgs

 check_input_partition_mountable "${PARTITION}"
 check_input_openable_luksvg "${PARTITION}"
 case "${NAME_BOOT}" in *[!A-Za-z0-9_.-]*|"")
 check_input_partition_mountable "${PARTITION}"
 check_input_openable_luksvg "${PARTITION}"
 case "${NAME_BOOT}" in *[!A-Za-z0-9_.-]*|"")

diff --git a/setup_luksvg.sh b/setup_luksvg.sh
index 885966ce1cb3bdd997cb7f3582be4b5e0162693c..9b7d99e8eedf199a243fc93678757b0e9da0f9f8 100755 (executable)
--- a/setup_luksvg.sh
+++ b/setup_luksvg.sh
@@ -17,7 +17,7 @@ PATH_VG_DATA=${PATH_VG}/${NAME_DATA}
 PATH_VG_SWAP=${PATH_VG}/${NAME_SWAP}
 
 # sanity checks
 PATH_VG_SWAP=${PATH_VG}/${NAME_SWAP}
 
 # sanity checks

-check_tools cryptsetup lvcreate mkfs.ext4 mkswap pvcreate vgcreate vgs
+check_tools cryptsetup lvcreate mkfs.ext4 mkswap vgchange vgcreate vgs

 check_input_partition_mountable "${PARTITION}"
 check_new_luksvg
 try_quiet cryptsetup isLuks "${PARTITION}"\
 check_input_partition_mountable "${PARTITION}"
 check_new_luksvg
 try_quiet cryptsetup isLuks "${PARTITION}"\