From c76c3a5e709e39a0b7c302023742b9072c5e696e Mon Sep 17 00:00:00 2001 From: James Bunton Date: Fri, 29 Mar 2024 15:24:34 +1100 Subject: [PATCH 1/7] notes: varlog subvolume --- notes/desktop:debian-bookworm.txt | 5 +++-- notes/raspi-headless:debian-bookworm.txt | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/notes/desktop:debian-bookworm.txt b/notes/desktop:debian-bookworm.txt index 745a71c..5c307fd 100644 --- a/notes/desktop:debian-bookworm.txt +++ b/notes/desktop:debian-bookworm.txt @@ -20,8 +20,8 @@ btrfs subv create @root btrfs subv set-default /mnt/@root btrfs subv create @home btrfs subv create @apt -btrfs subv create @vartmp -chmod 1777 @vartmp +btrfs subv create @varlog +btrfs subv create @vartmp; chmod 1777 @vartmp ; chmod 0755 @root/var/tmp umount /mnt/ mount /dev/mapper/$THE_HOSTNAME-root /mnt/ @@ -31,6 +31,7 @@ LABEL=btrfsroot / btrfs subvol=@root,discard,com 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 /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 PARTLABEL=XBOOTLDR /boot ext4 discard,nodev,nosuid,noexec 0 0 PARTLABEL=ESP /boot/efi vfat discard,nodev,nosuid,noexec 0 0 diff --git a/notes/raspi-headless:debian-bookworm.txt b/notes/raspi-headless:debian-bookworm.txt index b29a0e5..54f612c 100644 --- a/notes/raspi-headless:debian-bookworm.txt +++ b/notes/raspi-headless:debian-bookworm.txt @@ -21,6 +21,7 @@ mv ./* @root/ mv @root/ext2_saved/ @ext2_saved mkdir @root/btrfs btrfs subv create @apt; mv @root/var/cache/apt/archives/* @apt/ +btrfs subv create @varlog btrfs subv create @vartmp; chmod 1777 @vartmp ; chmod 0755 @root/var/tmp btrfs subv set-default @root @@ -29,6 +30,7 @@ cat <| @root/etc/fstab LABEL=RASPIROOT / btrfs subvol=@root,discard,compress,nodev 2 0 LABEL=RASPIROOT /btrfs btrfs subvol=/,discard,compress,nodev,nosuid 0 0 LABEL=RASPIROOT /var/cache/apt/archives btrfs subvol=@apt,discard,compress,nodev,nosuid 0 0 +LABEL=RASPIROOT /var/log btrfs subvol=@varlog,discard,compress,nodev,nosuid 0 0 LABEL=RASPIROOT /var/tmp btrfs subvol=@vartmp,discard,compress,nodev,nosuid 0 0 LABEL=RASPIFIRM /boot/firmware vfat discard,nodev,nosuid,noexec 1 0 EOT -- 2.39.2 From efa2e579015e10e11ec18c4deab9c84aafc274db Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sat, 30 Mar 2024 10:50:08 +1100 Subject: [PATCH 2/7] archpkg/repo-sign: Don't overwrite /dev/null! --- archpkg/repo-sign | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archpkg/repo-sign b/archpkg/repo-sign index e555c43..f72d8ea 100755 --- a/archpkg/repo-sign +++ b/archpkg/repo-sign @@ -25,7 +25,7 @@ if [ "${#tosign[@]}" -gt 0 ]; then echo set -x # Preload the agent - gpg --output /dev/null --detach-sign /dev/null + gpg --output - --detach-sign <(echo) > /dev/null echo "${tosign[@]}" | xargs -n1 gpg --detach-sign echo "${tosign[@]}" | xargs -n1 repo-add delx.db.tar.xz -R else -- 2.39.2 From 5da3de9dfd7ca0e3e37d893beebbc8f86327a8a1 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sat, 30 Mar 2024 10:49:59 +1100 Subject: [PATCH 3/7] package-lists cleanup --- .../{multimedia-players => desktop-video} | 1 + package-lists/arch/multimedia-cd | 3 --- package-lists/arch/multimedia-dvd | 2 -- package-lists/arch/system | 19 ------------------- package-lists/arch/system-efi-amd64 | 8 ++++++++ .../{multimedia-transcoding => transcoding} | 0 .../{multimedia-players => desktop-video} | 1 + package-lists/debian/multimedia-cd | 1 - package-lists/debian/multimedia-dvd | 2 -- package-lists/debian/multimedia-transcoding | 8 -------- 10 files changed, 10 insertions(+), 35 deletions(-) rename package-lists/arch/{multimedia-players => desktop-video} (85%) delete mode 100644 package-lists/arch/multimedia-cd delete mode 100644 package-lists/arch/multimedia-dvd delete mode 100644 package-lists/arch/system create mode 100644 package-lists/arch/system-efi-amd64 rename package-lists/arch/{multimedia-transcoding => transcoding} (100%) rename package-lists/debian/{multimedia-players => desktop-video} (88%) delete mode 100644 package-lists/debian/multimedia-cd delete mode 100644 package-lists/debian/multimedia-dvd delete mode 100644 package-lists/debian/multimedia-transcoding diff --git a/package-lists/arch/multimedia-players b/package-lists/arch/desktop-video similarity index 85% rename from package-lists/arch/multimedia-players rename to package-lists/arch/desktop-video index eb790a7..aafc97f 100644 --- a/package-lists/arch/multimedia-players +++ b/package-lists/arch/desktop-video @@ -1,3 +1,4 @@ +libdvdcss gst-libav gst-plugins-good gst-plugins-ugly diff --git a/package-lists/arch/multimedia-cd b/package-lists/arch/multimedia-cd deleted file mode 100644 index b5a5320..0000000 --- a/package-lists/arch/multimedia-cd +++ /dev/null @@ -1,3 +0,0 @@ -abcde -cdparanoia -glyr diff --git a/package-lists/arch/multimedia-dvd b/package-lists/arch/multimedia-dvd deleted file mode 100644 index 04c347b..0000000 --- a/package-lists/arch/multimedia-dvd +++ /dev/null @@ -1,2 +0,0 @@ -dvdbackup -libdvdcss diff --git a/package-lists/arch/system b/package-lists/arch/system deleted file mode 100644 index fd9f881..0000000 --- a/package-lists/arch/system +++ /dev/null @@ -1,19 +0,0 @@ -# bootloader -efibootmgr -grub - -# kernel/drivers -intel-ucode -linux-lts -linux-firmware -terminus-font # Linux VT -tlp - -# filesystems -cryptsetup -zfs-linux-lts - -# networking -crda -iw -networkmanager diff --git a/package-lists/arch/system-efi-amd64 b/package-lists/arch/system-efi-amd64 new file mode 100644 index 0000000..7a6d312 --- /dev/null +++ b/package-lists/arch/system-efi-amd64 @@ -0,0 +1,8 @@ +# bootloader +efibootmgr +grub + +# kernel/drivers +intel-ucode +linux-firmware +linux-lts diff --git a/package-lists/arch/multimedia-transcoding b/package-lists/arch/transcoding similarity index 100% rename from package-lists/arch/multimedia-transcoding rename to package-lists/arch/transcoding diff --git a/package-lists/debian/multimedia-players b/package-lists/debian/desktop-video similarity index 88% rename from package-lists/debian/multimedia-players rename to package-lists/debian/desktop-video index 02bd379..9dadaaf 100644 --- a/package-lists/debian/multimedia-players +++ b/package-lists/debian/desktop-video @@ -1,3 +1,4 @@ +libdvdcss gstreamer1.0-libav gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly diff --git a/package-lists/debian/multimedia-cd b/package-lists/debian/multimedia-cd deleted file mode 100644 index 00dedf6..0000000 --- a/package-lists/debian/multimedia-cd +++ /dev/null @@ -1 +0,0 @@ -abcde diff --git a/package-lists/debian/multimedia-dvd b/package-lists/debian/multimedia-dvd deleted file mode 100644 index 04c347b..0000000 --- a/package-lists/debian/multimedia-dvd +++ /dev/null @@ -1,2 +0,0 @@ -dvdbackup -libdvdcss diff --git a/package-lists/debian/multimedia-transcoding b/package-lists/debian/multimedia-transcoding deleted file mode 100644 index 7308254..0000000 --- a/package-lists/debian/multimedia-transcoding +++ /dev/null @@ -1,8 +0,0 @@ -atomicparsley -exiv2 -fdkaac -ffmpeg -handbrake-cli -imagemagick -mkvtoolnix -sox -- 2.39.2 From fd4cc48058184509707ad9adbac15d475f623044 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sun, 31 Mar 2024 08:36:27 +1100 Subject: [PATCH 4/7] package-lists: libdvdcss -> transcoding --- package-lists/arch/desktop-video | 1 - package-lists/arch/transcoding | 1 + package-lists/debian/desktop-video | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package-lists/arch/desktop-video b/package-lists/arch/desktop-video index aafc97f..eb790a7 100644 --- a/package-lists/arch/desktop-video +++ b/package-lists/arch/desktop-video @@ -1,4 +1,3 @@ -libdvdcss gst-libav gst-plugins-good gst-plugins-ugly diff --git a/package-lists/arch/transcoding b/package-lists/arch/transcoding index c3b42d8..bd1a38b 100644 --- a/package-lists/arch/transcoding +++ b/package-lists/arch/transcoding @@ -1,4 +1,5 @@ atomicparsley +libdvdcss exiv2 fdkaac ffmpeg diff --git a/package-lists/debian/desktop-video b/package-lists/debian/desktop-video index 9dadaaf..02bd379 100644 --- a/package-lists/debian/desktop-video +++ b/package-lists/debian/desktop-video @@ -1,4 +1,3 @@ -libdvdcss gstreamer1.0-libav gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly -- 2.39.2 From e2c96bc766d97c50eb18f18cac9d7b18caa06ff8 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sun, 31 Mar 2024 08:36:57 +1100 Subject: [PATCH 5/7] package-lists: debian printer fix --- package-lists/debian/desktop-printing | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package-lists/debian/desktop-printing b/package-lists/debian/desktop-printing index 817cbc0..c5b2986 100644 --- a/package-lists/debian/desktop-printing +++ b/package-lists/debian/desktop-printing @@ -1,3 +1,5 @@ avahi-daemon libnss-mdns cups +cups-pk-helper +system-config-printer -- 2.39.2 From 5eba0c1ecae38cbf3ada2789df9370885eeb3bf8 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sun, 7 Apr 2024 09:38:42 +1000 Subject: [PATCH 6/7] desktop-gnome: qt6-wayland --- package-lists/arch/desktop-gnome | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lists/arch/desktop-gnome b/package-lists/arch/desktop-gnome index 09e2c2c..9c65ebe 100644 --- a/package-lists/arch/desktop-gnome +++ b/package-lists/arch/desktop-gnome @@ -36,5 +36,6 @@ sushi tracker3 tracker3-miners qt5-wayland +qt6-wayland wl-clipboard xdg-desktop-portal-gnome -- 2.39.2 From fbf5b68591b5198d1188dc29a0f25044ef61277c Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sun, 7 Apr 2024 09:42:16 +1000 Subject: [PATCH 7/7] notes: fix raspi install notes, also @home -> @username --- notes/desktop:debian-bookworm.txt | 6 +++--- notes/raspi-headless:debian-bookworm.txt | 14 +++++++------- notes/snapper.txt | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/notes/desktop:debian-bookworm.txt b/notes/desktop:debian-bookworm.txt index 5c307fd..ce4150e 100644 --- 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 < /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 54f612c..db1f0a6 100644 --- 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 072ac9b..add3159 100644 --- 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/* ``` -- 2.39.2