From 40ea80a588cf4a248d672e40d9f67dc6f6e98600 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Tue, 25 Jun 2019 23:25:59 -0400
Subject: rootfs changes

---
 rootfs/kernel.yaml          |  2 +-
 rootfs/network-manager.yaml |  2 +-
 rootfs/samizdat-wip.yaml    | 11 ++++++++++-
 rootfs/samizdat-xorg.yaml   |  1 -
 rootfs/samizdat.yaml        |  8 ++++++--
 rootfs/useful.yaml          |  3 ---
 6 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'rootfs')

diff --git a/rootfs/kernel.yaml b/rootfs/kernel.yaml
index d8b10a7..dc3dd40 100644
--- a/rootfs/kernel.yaml
+++ b/rootfs/kernel.yaml
@@ -1,4 +1,4 @@
-parent: firmware
+parent: samizdat-xorg-extras
 packages:
 - busybox
 - cpio
diff --git a/rootfs/network-manager.yaml b/rootfs/network-manager.yaml
index a6c2844..a5d26e3 100644
--- a/rootfs/network-manager.yaml
+++ b/rootfs/network-manager.yaml
@@ -1,4 +1,4 @@
-parent: kernel
+parent: firmware
 packages:
 - network-manager
 - avahi-daemon
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml
index b1bc1d9..050157f 100644
--- a/rootfs/samizdat-wip.yaml
+++ b/rootfs/samizdat-wip.yaml
@@ -1,5 +1,14 @@
-parent: samizdat-xorg-extras
+parent: kernel
+unpack-only: true
 packages:
+- ../../src/openssh-client_7.9p1-10_amd64.deb
+- ../../src/openssh-server_7.9p1-10_amd64.deb
+- ../../src/openssh-sftp-server_7.9p1-10_amd64.deb
+# ../../src/openssh-tests_7.9p1-10_amd64.deb
+- ../../src/ssh_7.9p1-10_all.deb
+- ../../src/ssh-askpass-gnome_7.9p1-10_amd64.deb
+
+
 - sudo
 - dnsutils
 - cron
diff --git a/rootfs/samizdat-xorg.yaml b/rootfs/samizdat-xorg.yaml
index 41a9380..c434797 100644
--- a/rootfs/samizdat-xorg.yaml
+++ b/rootfs/samizdat-xorg.yaml
@@ -5,6 +5,5 @@ packages:
 - xserver-xorg-input-all
 - xserver-xorg-input-wacom
 - dmenu
-- firefox-esr
 binaries:
 - xmonad
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index 4fe094d..31ac4a6 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -1,11 +1,15 @@
 parent: samizdat-wip
-packages: []
+unpack-only: true
 binaries:
 - samizdat-diff-root
 - samizdat-daily-snapshot-root
+- kiki
+- cokiki 
+- hosts
+
 skel-files: []
 
 chroot-commands:
 - "useradd u -G sudo -m -p '' -s /bin/bash"
 - "touch /var/lib/sudo/lectured/u"
-- "apt-get -f install"
+# - "DEBIAN_FRONTEND=noninteractive apt-get -f install"
diff --git a/rootfs/useful.yaml b/rootfs/useful.yaml
index fa3d014..edec839 100644
--- a/rootfs/useful.yaml
+++ b/rootfs/useful.yaml
@@ -4,6 +4,3 @@ packages:
 - vim-tiny
 - git
 - tmux
-- ssh
-chroot-commands:
-- "rm -f /etc/ssh/ssh_host_*_key*"
-- 
cgit v1.2.3