tons of misc updates

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 36895aa1612ad1d58bc923775d19887117fdf60f..186b9602dd72010b67a3da62a100717c932950fd 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -220,7 +220,7 @@ for vol in q a o i; do
     # todo: decipher /mnt/root, like we do in check-subvol-stale
     cd /mnt/root
     if [[ -e $vol ]]; then
-        e mv $vol $vol.leaf.$(date +%Y%m%dT%H%M%S%z)
+        e mv $vol $vol.leaf.$(date +%Y-%m-%dT%H:%M:%S-%z)
     fi
     # Note, we make a few assumptions in this script, like
     # $d was not a different subvol id than $vol, and
@@ -234,7 +234,7 @@ for vol in q a o i; do
 done
 
 ### disabled
-if [[ $HOSTNAME == treetowlxxxxxxxxx ]]; then
+if [[ $HOSTNAME == kdxxxxxxxxx ]]; then
     # partitioned it with fai partitioner outside of fai,
     # because it\'s worth it to have 1% space reserved for boot and
     # swap partitions in case I ever want to boot off those drives.
@@ -263,7 +263,7 @@ if [[ $HOSTNAME == treetowlxxxxxxxxx ]]; then
 EOF
         fi
         tu /etc/crypttab <<EOF
-crypt_dev_$dev  /dev/disk/by-id/$dev  /q/root/luks/host-treetowl  discard,luks
+crypt_dev_$dev  /dev/disk/by-id/$dev  /q/root/luks/host-kd  discard,luks
 EOF
         if [[ ! -e /dev/mapper/crypt_dev_$dev ]]; then
             cryptdisks_start crypt_dev_$dev