From 1592a5000af5a6ba48d644a59dd751f1a823dec1 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Mon, 12 Oct 2020 14:26:33 -0400
Subject: rootfs is building

sort of.

manual intervention was employed.
---
 rootfs/Makefile            |  5 +++--
 rootfs/build-deps.yaml     |  9 ++++-----
 rootfs/samizdat-wip.yaml   | 22 +++++++++++++---------
 rootfs/samizdat.patch.yaml |  4 +++-
 rootfs/samizdat.yaml       |  3 +++
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/rootfs/Makefile b/rootfs/Makefile
index 9e4e15a..7bb9619 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -14,5 +14,6 @@ all: rootfs $(ifneq $(patchfs),,patchfs)
 
 rootfs $(rootfs):
 	$(sudo) $(fsmgr) build $(rootfs)
-patchfs $(patchfs): $(rootfs)
-	$(sudo) $(fsmgr) build $(patchfs)
+
+patchfs $(patchfs):
+	$(sudo) REWRITE_SOURCES_LIST=y $(fsmgr) build $(patchfs)
diff --git a/rootfs/build-deps.yaml b/rootfs/build-deps.yaml
index cf36bab..3e41e63 100644
--- a/rootfs/build-deps.yaml
+++ b/rootfs/build-deps.yaml
@@ -1,5 +1,5 @@
 parent: samizdat-wip
-unpack-only: false
+# unpack-only: true
 packages:
 - libncurses5-dev
 - kbd
@@ -38,12 +38,11 @@ packages:
 #- openssh-sftp-server
 - parted
 - pgpdump
-- pulseaudio-module-bluetooth
-- pulseaudio-module-jack
-- pulseaudio-utils
+# - pulseaudio-module-bluetooth
+# - pulseaudio-module-jack
+# - pulseaudio-utils
 - qemu-system-x86
 #- ssh
 #- ssh-askpass-gnome
-- sshfs
 - strace
 - uml-utilities
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml
index afb92ea..211b854 100644
--- a/rootfs/samizdat-wip.yaml
+++ b/rootfs/samizdat-wip.yaml
@@ -1,16 +1,19 @@
 parent: kernel
-unpack-only: false
+# unpack-only: true
+# chroot-commands:
+# - "DEBIAN_FRONTEND=noninteractive dpkg --no-triggers --configure -a"
+
 packages:
-- ../openssh-client_8.3p1-1_$(debarch).deb
-- ../openssh-server_8.3p1-1_$(debarch).deb
-- ../openssh-sftp-server_8.3p1-1_$(debarch).deb
-# ../openssh-tests_8.3p1-1_$(debarch).deb
-- ../ssh_8.3p1-1_all.deb
-- ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb
+# - ../openssh-client_8.3p1-1_$(debarch).deb
+# - ../openssh-server_8.3p1-1_$(debarch).deb
+# - ../openssh-sftp-server_8.3p1-1_$(debarch).deb
+# # ../openssh-tests_8.3p1-1_$(debarch).deb
+# - ../ssh_8.3p1-1_all.deb
+# - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb
 
 - dnsutils
 - cron
-- sshfs
+# - sshfs
 - emacs25
 - gpm
 - parted
@@ -27,7 +30,7 @@ packages:
 - 'jackd' # jack-plumbing
 - 'pulseaudio' # pavol
 - 'pulseaudio-module-jack'
-- 'pulseaudio-module-bluetooth'
+# - 'pulseaudio-module-bluetooth'
 
 - 'xserver-xorg-input-wacom'
 
@@ -54,6 +57,7 @@ skel-files-optional:
 - '.vimrc'
 - '.xbindkeysrc'
 - '.xinitrc'
+
 - '.Xresources'
 
 # keymap control/recue
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml
index c9f3874..2067801 100644
--- a/rootfs/samizdat.patch.yaml
+++ b/rootfs/samizdat.patch.yaml
@@ -1,5 +1,5 @@
 parent: samizdat
-seedme: 150000000
+seedme: 210000000
 apt-update: true
 binaries:
 - './samizdat-update-apt-cache.sh'
@@ -10,10 +10,12 @@ chroot-commands:
 - "/usr/local/bin/samizdat-patch-root.sh"
 - "/usr/local/bin/samizdat-hostname.sh"
 packages:
+- linux-image-$(kver)-$(karch)
 - ../openssh-client_8.3p1-1_$(debarch).deb
 - ../openssh-server_8.3p1-1_$(debarch).deb
 - ../openssh-sftp-server_8.3p1-1_$(debarch).deb
 # ../openssh-tests_8.3p1-1_$(debarch).deb
 - ../ssh_8.3p1-1_all.deb
 - ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb
+- sshfs
 
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index b4a7008..cf82ce8 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -14,7 +14,10 @@ skel-files: []
 
 chroot-commands:
 - "useradd u -G sudo -m -p '' -s /bin/bash"
+# - 'loginctl enable-linger u'
+- "dpkg --configure sudo"
 - "touch /var/lib/sudo/lectured/u"
 - "echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
+
 - "systemctl enable debug-shell"
 - "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
-- 
cgit v1.2.3