From 50682740176cf5614c3432e10d8ded36b8b765eb Mon Sep 17 00:00:00 2001
From: D4rk4 <h31337@gmail.com>
Date: Fri, 31 Jul 2020 03:30:03 +0200
Subject: [PATCH] Remove k8s from seed

---
 contrib/k8s-seed.txt | 5 -----
 runme.sh             | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/contrib/k8s-seed.txt b/contrib/k8s-seed.txt
index abe9e6f..634c058 100644
--- a/contrib/k8s-seed.txt
+++ b/contrib/k8s-seed.txt
@@ -89,17 +89,12 @@ d-i preseed/late_command string in-target /bin/sh -c " \
        update-alternatives --set arptables /usr/sbin/arptables-legacy ; \
        update-alternatives --set ebtables /usr/sbin/ebtables-legacy ; \
        ( systemctl disable nftables && systemctl mask nftables ) ; \
-       curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - ; \
        curl -s https://download.docker.com/linux/debian/gpg | sudo apt-key add - ; \
-       echo 'deb https://apt.kubernetes.io/ kubernetes-xenial main' >/etc/apt/sources.list.d/kubernetes.list ; \
        echo 'deb [arch=amd64] https://download.docker.com/linux/debian/ stretch stable' >/etc/apt/sources.list.d/docker.list ; \
        apt-get update ; \
        apt-get install -y \
           docker-ce docker-ce-cli containerd.io \
           kubelet kubeadm kubectl ; \
-       apt-mark hold \
-          docker-ce docker-ce-cli containerd.io \
-          kubelet kubeadm kubectl ; \
        apt-get clean ; \
        systemctl enable serial-getty@ttyS0.service ; \
        systemctl enable docker.service  \
diff --git a/runme.sh b/runme.sh
index d931acb..075726e 100755
--- a/runme.sh
+++ b/runme.sh
@@ -4,7 +4,7 @@ apptmp='/dev/shm'
 vmsize='8G'
 vmmem='2G'
 k8sdsk="${apptmp}/k8s.raw"
-httpboot='http://ftp.debian.org/debian/dists/stretch/main/installer-amd64/current/images/netboot/debian-installer/amd64/'
+httpboot='http://ftp.debian.org/debian/dists/stretch/main/installer-amd64/current/images/netboot/debian-installer/amd64'
 seed='https://git.ix.gs/public/coins-demo/raw/branch/master/contrib/k8s-seed.txt'
 qemu="${appdir}/contrib/qemu-system-x86_64 -L ${appdir}/contrib/share/qemu -net nic -net user -m ${vmmem} -localtime -enable-kvm -cpu host,+nx -M pc -smp 2 -vga std -usbdevice tablet -k en-us -hda ${k8sdsk} -boot once=d -nographic"
 ###