notes: fix raspi install notes, also @home -> @username

diff --git a/notes/desktop:debian-bookworm.txt b/notes/desktop:debian-bookworm.txt
index 5c307fd70d35144b70e43f9ccb37acee254e396f..ce4150e16db6de4e47c45479d7b58b236aba4f19 100644 (file)
--- a/notes/desktop:debian-bookworm.txt
+++ b/notes/desktop:debian-bookworm.txt
@@ -18,7 +18,7 @@ cd /mnt/
 btrfs fi label /mnt/ btrfsroot
 btrfs subv create @root
 btrfs subv set-default /mnt/@root
-btrfs subv create @home
+btrfs subv create @$THE_USERNAME
 btrfs subv create @apt
 btrfs subv create @varlog
 btrfs subv create @vartmp; chmod 1777 @vartmp ; chmod 0755 @root/var/tmp
@@ -29,7 +29,7 @@ mkdir -p /mnt/etc/
 cat <<EOT > /mnt/etc/fstab
 LABEL=btrfsroot             /                   btrfs   subvol=@root,discard,compress,nodev             0 0
 LABEL=btrfsroot             /btrfs              btrfs   subvol=/,discard,compress,nodev,nosuid          0 0
-LABEL=btrfsroot             /home               btrfs   subvol=@home,discard,compress,nodev,nosuid      0 0
+LABEL=btrfsroot             /home/$THE_USERNAME btrfs   subvol=@$THE_USERNAME,discard,compress,nodev,nosuid      0 0
 LABEL=btrfsroot             /var/cache/apt      btrfs   subvol=@apt,discard,compress,nodev,nosuid       0 0
 LABEL=btrfsroot             /var/log            btrfs   subvol=@varlog,discard,compress,nodev,nosuid    0 0
 LABEL=btrfsroot             /var/tmp            btrfs   subvol=@vartmp,discard,compress,nodev,nosuid    0 0
@@ -51,7 +51,7 @@ EOT
 
 for i in /dev /proc /sys /run /tmp; do mount --rbind $i /mnt$i; done
 chroot /mnt/
-mkdir -p /btrfs/ /boot/efi/ /home/ /var/cache/apt/ /var/tmp/
+mkdir -p /btrfs/ /boot/efi/ /home/$THE_USERNAME /var/cache/apt/ /var/tmp/
 
 
 mkdir /run/systemd/resolve/

diff --git a/notes/raspi-headless:debian-bookworm.txt b/notes/raspi-headless:debian-bookworm.txt
index 54f612c5dd4e5303e2be1aa558ea4bdadd619b4a..db1f0a68533431d959c63cc8359992670b04197b 100644 (file)
--- a/notes/raspi-headless:debian-bookworm.txt
+++ b/notes/raspi-headless:debian-bookworm.txt
@@ -6,7 +6,7 @@ raspi.debian.net
 xzcat image.xz | pv > $THE_DEV
 
 
-gdisk $THE_DEV
+fdisk $THE_DEV
 # resize partition 2
 
 
@@ -40,14 +40,14 @@ rm @root/initrd.img @root/initrd.img.old @root/vmlinuz @root/vmlinuz.old
 echo 'do_symlinks=no' > @root/etc/kernel-img.conf
 
 rmdir @root/var/log/journal
-find @root/usr/local -type f -print #-delete
-find @root/etc/systemd/system -name 'rpi*' -print #-delete
+find @root/usr/local -type f -print -delete
+find @root/etc/systemd/system -name 'rpi*' -print -delete
 find @root/etc/systemd/system -type d -empty -print -delete
 
 
-echo $THE_HOSTNAME > @root/etc/hostname
+echo $THE_HOSTNAME >| @root/etc/hostname
 ln -sf /usr/share/zoneinfo/Australia/Sydney @root/etc/localtime
-echo > @root/etc/motd
+echo -n >| @root/etc/motd
 
 
 cp ~/monosys/etc/ssh/sshd_config @root/etc/ssh/sshd_config
@@ -64,8 +64,8 @@ dpkg-reconfigure raspi-firmware
 apt-get update
 apt-get install locales
 dpkg-reconfigure locales
-apt-get install aptitude curl git python3 vim
 
+apt-get install aptitude curl git python3 vim
 curl -sSfL https://code.delx.au/p/dotfiles | bash
 exit
 ssh root@192.168.1.XXX
@@ -79,7 +79,7 @@ cp monosys/etc/systemd/network/ethernet.network /etc/systemd/network/
 systemctl stop networking ; systemctl restart systemd-networkd
 systemctl disable networking ; systemctl enable systemd-networkd
 
-
+apt-get install aptitude
 mkdir /root/monosys/package-lists/local
 ln -s /root/monosys/package-lists/local /root/.aptorphan
 cd /root/monosys/package-lists/local

diff --git a/notes/snapper.txt b/notes/snapper.txt
index 072ac9b9b7cf81ab1994b0200ac4a2edf9cd6b49..add31594f4407bdf7e92c0af0b1588ef9e4e1f3a 100644 (file)
--- a/notes/snapper.txt
+++ b/notes/snapper.txt
@@ -1,5 +1,5 @@
 snapper -c root create-config /
-snapper -c home create-config /home
+snapper -c $USERNAME create-config /home/$USERNAME
 
 vim /etc/snapper/configs/*
 ```