Remove unnecessary indirections.

diff --git a/setup_scripts/lib/DIRNAME_CHROOT.sh b/setup_scripts/lib/DIRNAME_CHROOT.sh
deleted file mode 100644 (file)
index a04cb92..0000000
--- a/setup_scripts/lib/DIRNAME_CHROOT.sh
+++ /dev/null
@@ -1 +0,0 @@
-DIRNAME_CHROOT=chroot

diff --git a/setup_scripts/lib/FNAME_FIRST_BOOT_PENDING.sh b/setup_scripts/lib/FNAME_FIRST_BOOT_PENDING.sh
deleted file mode 100644 (file)
index ea8a3c6..0000000
--- a/setup_scripts/lib/FNAME_FIRST_BOOT_PENDING.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-FNAME_FIRST_BOOT_PENDING=.first-boot-pending
-

diff --git a/setup_scripts/lib/IDX_PARTITION_LUKSVG.sh b/setup_scripts/lib/IDX_PARTITION_LUKSVG.sh
deleted file mode 100644 (file)
index eabae5c..0000000
--- a/setup_scripts/lib/IDX_PARTITION_LUKSVG.sh
+++ /dev/null
@@ -1 +0,0 @@
-IDX_PARTITION_LUKSVG=3

diff --git a/setup_scripts/lib/IDX_PARTITION_RESCUE.sh b/setup_scripts/lib/IDX_PARTITION_RESCUE.sh
deleted file mode 100644 (file)
index 68368c9..0000000
--- a/setup_scripts/lib/IDX_PARTITION_RESCUE.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-IDX_PARTITION_RESCUE=2
-

diff --git a/setup_scripts/lib/NAME_BOOT_DEVICE.sh b/setup_scripts/lib/NAME_BOOT_DEVICE.sh
deleted file mode 100644 (file)
index 366a8ce..0000000
--- a/setup_scripts/lib/NAME_BOOT_DEVICE.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-NAME_BOOT_DEVICE=nvme0n1
-

diff --git a/setup_scripts/lib/PATH_BOOT_DEVICE.sh b/setup_scripts/lib/PATH_BOOT_DEVICE.sh
index 34b8ede0b19b4eff1bc74efef45ce44c338763fe..1eb64bdc366112ca0fc275ca299c6d823608e81e 100644 (file)
--- a/setup_scripts/lib/PATH_BOOT_DEVICE.sh
+++ b/setup_scripts/lib/PATH_BOOT_DEVICE.sh
@@ -1,4 +1,4 @@
 . lib/NAME_BOOT_DEVICE.sh
 . lib/PATH_DEV.sh
 
-PATH_BOOT_DEVICE="${PATH_DEV}/${NAME_BOOT_DEVICE}"
+PATH_BOOT_DEVICE="${PATH_DEV}/nvme0n1"

diff --git a/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh b/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh
index 05e0c83ac37585bb08bd53179c12fa648cc879ee..4cbe708521b9ed4208427a7bfaa0c316640ae165 100644 (file)
--- a/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh
+++ b/setup_scripts/lib/PATH_FIRST_BOOT_PENDING.sh
@@ -1,5 +1,4 @@
-. lib/FNAME_FIRST_BOOT_PENDING.sh
 . lib/PATH_HOME_ROOT.sh
 
-PATH_FIRST_BOOT_PENDING="${PATH_HOME_ROOT}/${FNAME_FIRST_BOOT_PENDING}"
+PATH_FIRST_BOOT_PENDING="${PATH_HOME_ROOT}/.first-boot-pending"
 

diff --git a/setup_scripts/lib/PATH_MNT_CHROOT.sh b/setup_scripts/lib/PATH_MNT_CHROOT.sh
index 31aaab5aa2c7b480bfb1acd62141c300212ce080..cc3ae8bf5a75bc7638595cddb7702e8ad4fb8455 100644 (file)
--- a/setup_scripts/lib/PATH_MNT_CHROOT.sh
+++ b/setup_scripts/lib/PATH_MNT_CHROOT.sh
@@ -1,4 +1,3 @@
-. lib/DIRNAME_CHROOT.sh
 . lib/PATH_MNT.sh
 
-PATH_MNT_CHROOT="${PATH_MNT}/${DIRNAME_CHROOT}"
+PATH_MNT_CHROOT="${PATH_MNT}/chroot"

diff --git a/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh b/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh
index b45b6886d04f53ba587a47e7f4c84e5d5347df87..86422d9684158099426591b8e596a20d50e36db2 100644 (file)
--- a/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh
+++ b/setup_scripts/lib/PATH_PARTITION_LUKSVG.sh
@@ -1,5 +1,5 @@
 . lib/IDX_PARTITION_LUKSVG.sh
 . lib/PATH_BOOT_DEVICE.sh
 
-PATH_PARTITION_LUKSVG="${PATH_BOOT_DEVICE}p${IDX_PARTITION_LUKSVG}"
+PATH_PARTITION_LUKSVG="${PATH_BOOT_DEVICE}p3"
 

diff --git a/setup_scripts/lib/PATH_PARTITION_RESCUE.sh b/setup_scripts/lib/PATH_PARTITION_RESCUE.sh
deleted file mode 100644 (file)
index cb88090..0000000
--- a/setup_scripts/lib/PATH_PARTITION_RESCUE.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-. lib/IDX_PARTITION_RESCUE.sh
-. lib/PATH_BOOT_DEVICE.sh
-
-PATH_PARTITION_RESCUE="${PATH_BOOT_DEVICE}p${IDX_PARTITION_RESCUE}"
-

diff --git a/setup_scripts/lib/PATH_PROFILE.sh b/setup_scripts/lib/PATH_PROFILE.sh
deleted file mode 100644 (file)
index 857673e..0000000
--- a/setup_scripts/lib/PATH_PROFILE.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. lib/FNAME_PROFILE.sh
-
-PATH_PROFILE="${HOME}/${FNAME_PROFILE}"
-

diff --git a/setup_scripts/lib/TIMEZONE.sh b/setup_scripts/lib/TIMEZONE.sh
deleted file mode 100644 (file)
index 0aaf39b..0000000
--- a/setup_scripts/lib/TIMEZONE.sh
+++ /dev/null
@@ -1 +0,0 @@
-TIMEZONE=Europe/Berlin

diff --git a/setup_scripts/lib/augment_profile.sh b/setup_scripts/lib/augment_profile.sh
index 75411f5942ffdb2efed13bbd6d036018913ebf50..16ea532e8d99f34ec1134c41c3a310826eb6ec51 100644 (file)
--- a/setup_scripts/lib/augment_profile.sh
+++ b/setup_scripts/lib/augment_profile.sh
@@ -4,6 +4,7 @@
 
 augment_profile() {
     local ALIAS_LS='alias ls="ls --color=auto"'
+    local PATH_PROFILE="${HOME}/${FNAME_PROFILE}"
     msg 'Augmenting user %s …' "${FNAME_PROFILE}"
     # test ensures idempotency
     grep -qxF "${ALIAS_LS}" "${PATH_PROFILE}" 2>/dev/null\

diff --git a/setup_scripts/lib/check_boot_device_layout.sh b/setup_scripts/lib/check_boot_device_layout.sh
index 60f1cadcbeeb5cdac98a7ddec4085377588e7889..dfcf2263b4c271eaaafb0eec91e7131a6d311b9f 100644 (file)
--- a/setup_scripts/lib/check_boot_device_layout.sh
+++ b/setup_scripts/lib/check_boot_device_layout.sh
@@ -8,6 +8,7 @@
 
 check_boot_device_layout() {
     local COUNT_NVME
+    local PATH_PARTITION_RESCUE="${PATH_BOOT_DEVICE}p2"
     COUNT_NVME=$(find "${PATH_DEV}" -maxdepth 1 -name 'nvme*n[0-9]' | wc -l)
     [ "${COUNT_NVME}" -eq 1 ]\
         || error "expected 1 NVMe device in ${PATH_DEV}, found ${COUNT_NVME}"

diff --git a/setup_scripts/lib/check_new_luksvg.sh b/setup_scripts/lib/check_new_luksvg.sh
index 499ea7396cba719b550da6362ed6cb6661c6e468..b1aa3c2dbc5067da9ccb625faaeb2142c9ed15b8 100644 (file)
--- a/setup_scripts/lib/check_new_luksvg.sh
+++ b/setup_scripts/lib/check_new_luksvg.sh
@@ -1,11 +1,10 @@
 . lib/NAME_LUKSVG.sh
 . lib/error.sh
-. lib/path_luks_mapper.sh
 . lib/try_quiet.sh
 
 check_new_luksvg() {
     local PATH_LUKS_MAPPER
-    PATH_LUKS_MAPPER=$(path_luks_mapper "${NAME_LUKSVG}")
+    PATH_LUKS_MAPPER="${PATH_DEV}/mapper/${NAME_LUKSVG}"
     try_quiet vgs "${NAME_LUKSVG}"\
         && error "volume group '${NAME_LUKSVG}' already exists"
     [ -e "${PATH_LUKS_MAPPER}" ]\

diff --git a/setup_scripts/lib/path_luks_mapper.sh b/setup_scripts/lib/path_luks_mapper.sh
deleted file mode 100644 (file)
index f4c456d..0000000
--- a/setup_scripts/lib/path_luks_mapper.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-. lib/PATH_DEV.sh
-
-path_luks_mapper() {
-    printf '%s/mapper/%s' "${PATH_DEV}" "$1"
-}

diff --git a/setup_scripts/lib/start_root.sh b/setup_scripts/lib/start_root.sh
index 98ce1bb42bd1dc5a4c4b26c78f38eeaea99036d5..53c35735f4899270e59d548129b0de6409fcc54a 100644 (file)
--- a/setup_scripts/lib/start_root.sh
+++ b/setup_scripts/lib/start_root.sh
@@ -10,6 +10,7 @@
 start_root() {
     local PATH_TO_INSTALL="${PATH_REPO}/to_install/$1"
     local PATH_SCRIPT_USER="${PATH_REPO}/${DIRNAME_SCRIPTS}/start_user.sh"
+    local TIMEZONE=Europe/Berlin
     # Assuming read file ends with a newline, has no blank lines, and its
     # package-name lines contain no whitespace besides that newline.
     local TO_INSTALL=