various rootfs improvements

8 files changed, 41 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index b13f3ff..f478160 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,7 @@ update-submodules:
 install-submodules: cmd=install
 install-submodules: update-submodules $(INSTALL_SUBMODULES)
 
-GOLD = y
+GOLD =
 ifdef GOLD
 rootfs = samizdat-gold.seed.btrfs
 patchfs =
diff --git a/rootfs/Makefile b/rootfs/Makefile
index b7a039c..eb96398 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -8,7 +8,9 @@ sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo)
 
 rootfs ?= samizdat.seed.btrfs
 patchfs ?= samizdat.patch.btrfs
-gold ?= samizdat-gold.btrfs
+# gold ?= samizdat-gold.btrfs
+
+.DEFAULT_GOAL = all
 
 .PHONY: all rootfs patchfs gold
 all: $(rootfs) $(patchfs) $(gold)
diff --git a/rootfs/buster-backport-kernel.yaml b/rootfs/buster-backport-kernel.yaml
deleted file mode 100644
index e2f6236..0000000
--- a/rootfs/buster-backport-kernel.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-parent: samizdat
-apt-update: true
-packages:
-- linux-image-$(kver)-$(karch)
-
diff --git a/rootfs/kernel.yaml b/rootfs/kernel.yaml
index 1ab32cc..d3768a5 100644
--- a/rootfs/kernel.yaml
+++ b/rootfs/kernel.yaml
@@ -12,6 +12,6 @@ packages:
 - libklibc
 - libnuma1
 - linux-base
-- linux-image-$(karch)
+- linux-image-$(kver)-$(karch)
 #chroot-commands:
 #- "apt-get update; apt-get -y install linux-image-$(uname -r | sed 's/.*-//')"
diff --git a/rootfs/rc-local.service b/rootfs/rc-local.service
new file mode 100644
index 0000000..4483ad0
--- /dev/null
+++ b/rootfs/rc-local.service
@@ -0,0 +1,14 @@
+[Unit]
+ Description=/etc/rc.local Compatibility
+ ConditionPathExists=/etc/rc.local
+
+[Service]
+ Type=forking
+ ExecStart=/etc/rc.local start
+ TimeoutSec=0
+ StandardOutput=tty
+ RemainAfterExit=yes
+ SysVStartPriority=99
+
+[Install]
+ WantedBy=multi-user.target
diff --git a/rootfs/samizdat-gold.yaml b/rootfs/samizdat-gold.yaml
index b24ffba..0e0d2cd 100644
--- a/rootfs/samizdat-gold.yaml
+++ b/rootfs/samizdat-gold.yaml
@@ -1,4 +1,4 @@
-parent: buster-backport-kernel
+parent: samizdat
 apt-update: true
 
 binaries:
@@ -9,13 +9,4 @@ chroot-commands:
 - "/usr/local/bin/samizdat-update-apt-cache.sh"
 - "/usr/local/bin/samizdat-patch-root.sh"
 - "/usr/local/bin/samizdat-hostname.sh"
-packages:
-- linux-image-$(kver)-$(karch)
-- ../openssh-client_8.4p1-2_$(debarch).deb
-- ../openssh-server_8.4p1-2_$(debarch).deb
-- ../openssh-sftp-server_8.4p1-2_$(debarch).deb
-# ../openssh-tests_8.4p1-2_$(debarch).deb
-- ../ssh_8.4p1-2_all.deb
-- ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb
-- sshfs
 
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml
index f4b7e55..6240d53 100644
--- a/rootfs/samizdat.patch.yaml
+++ b/rootfs/samizdat.patch.yaml
@@ -9,13 +9,4 @@ chroot-commands:
 - "/usr/local/bin/samizdat-update-apt-cache.sh"
 - "/usr/local/bin/samizdat-patch-root.sh"
 - "/usr/local/bin/samizdat-hostname.sh"
-packages:
-- linux-image-$(kver)-$(karch)
-- ../openssh-client_8.4p1-2_$(debarch).deb
-- ../openssh-server_8.4p1-2_$(debarch).deb
-- ../openssh-sftp-server_8.4p1-2_$(debarch).deb
-# ../openssh-tests_8.4p1-2_$(debarch).deb
-- ../ssh_8.4p1-2_all.deb
-- ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb
-- sshfs
 
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index 4696b67..3bbedc3 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -7,18 +7,34 @@ binaries:
 - cokiki
 - hosts
 packages:
-# - sudo
+- sudo
 - dbus-x11
+- linux-image-$(kver)-$(karch)
+- ../openssh-client_8.4p1-2_$(debarch).deb
+- ../openssh-server_8.4p1-2_$(debarch).deb
+- ../openssh-sftp-server_8.4p1-2_$(debarch).deb
+#- ../openssh-tests_8.4p1-2_$(debarch).deb
+#- putty-tools
+- ../ssh_8.4p1-2_all.deb
+- ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb
+- sshfs
+- procps
+- net-tools
+- wireless-tools
+unit-files:
+- rc-local.service
 
 skel-files: []
 
 chroot-commands:
 #- "dpkg-statoverride"
 - "useradd u -G sudo -m -p '' -s /bin/bash"
-# - 'loginctl enable-linger u'
-#- "dpkg --configure sudo"
-#- "touch /var/lib/sudo/lectured/u"
+- "useradd d -G sudo -m -p '' -s /bin/bash"
+- "echo '#!/bin/sh' > /etc/rc.local && chmod +x /etc/rc.local"
+- "echo loginctl enable-linger u >> /etc/rc.local"
+- "dpkg --configure sudo || true"
+- "touch /var/lib/sudo/lectured/u"
 - "mkdir -p /etc/sudoers.d; echo 'u ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/u"
 
 - "systemctl enable debug-shell"
-- "DEBIAN_FRONTEND=noninteractive apt-get -f install; true"
+- "DEBIAN_FRONTEND=noninteractive apt -f install; true"