From 0d93e7ef42b0b34110bf1f71ddfdd91bc25b407a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Wed, 19 Feb 2020 15:46:33 -0500
Subject: [PATCH] turn packaging list and luks config into post-scripts

This is so we have one less thing to do by hand in the installer.
---
 tsa/howto/new-machine-hetzner-robot.mdwn | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/tsa/howto/new-machine-hetzner-robot.mdwn b/tsa/howto/new-machine-hetzner-robot.mdwn
index 9f644d25..77e70034 100644
--- a/tsa/howto/new-machine-hetzner-robot.mdwn
+++ b/tsa/howto/new-machine-hetzner-robot.mdwn
@@ -112,27 +112,11 @@ which we'll use below.
         mkdir -p /target/run && mount -t tmpfs tgt-run /target/run &&
         mkdir /target/run/udev && mount -o bind /run/udev /target/run/udev &&
         apt-get install -y grml-debootstrap && \
-        sed -e 's/postfix//;
-                s/vlan//;
-                s/bridge-utils//;
-                s/ifenslave//;
-                s/resolvconf//;
-                s/zsh//;
-                s/strace//;
-                s/os-prober//;
-                s/bzip2//;
-                s/file//;
-                s/lsof//;
-                s/most//;
-                $adbus
-                $acryptsetup-initramfs
-                ' /etc/debootstrap/packages > /root/grml-packages &&
-        mkdir -p /etc/debootstrap/post-scripts/ &&
-        cp /root/tsa-misc/installer/tor-install-luks-setup /etc/debootstrap/post-scripts/ &&
         grml-debootstrap --grub "$BOOT_DISK" --target /target \
             --hostname `hostname` --release buster \
             --mirror https://mirror.hetzner.de/debian/packages/ \
-            --packages /root/grml-packages \
+            --packages /root/tsa-misc/installer/packages \
+            --post-scripts /root/tsa-misc/installer/post-scripts/ \
             --password "$ROOTPASSWORD" \
             --sshcopyid \
             --remove-configs --defaultinterfaces &&
-- 
GitLab