From bde0fb679e0441cdf6a5175969f2236445a4a5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Sowa?= <bsowa123@gmail.com>
Date: Tue, 22 Jun 2021 13:44:55 +0000
Subject: [PATCH] Download the newest fictionlab GPG key

---
 stage1/04-sys-tweaks/01-run.sh                |  9 ++--
 stage1/04-sys-tweaks/files/apt/fictionlab.key | 41 -------------------
 2 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 stage1/04-sys-tweaks/files/apt/fictionlab.key

diff --git a/stage1/04-sys-tweaks/01-run.sh b/stage1/04-sys-tweaks/01-run.sh
index 81da9ad..0f7a655 100755
--- a/stage1/04-sys-tweaks/01-run.sh
+++ b/stage1/04-sys-tweaks/01-run.sh
@@ -25,9 +25,10 @@ log "Adding Fictionlab Apt repository"
 
 install -v -m 644 files/apt/fictionlab.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
 
-on_chroot "apt-key add -" <files/apt/fictionlab.key
-on_chroot "apt-get update"
-
+on_chroot << EOF
+curl -s https://files.fictionlab.pl/repo/repo.key | sudo apt-key add -
+apt-get update
+EOF
 
 log "Performing other system modifications"
 
@@ -38,4 +39,4 @@ install -v -m 644 files/polkit/*.pkla "${ROOTFS_DIR}/etc/polkit-1/localauthority
 
 install -v -m 644 files/regenerate_ssh_host_keys.service "${ROOTFS_DIR}/etc/systemd/system/"
 
-on_chroot "systemctl enable regenerate_ssh_host_keys"
\ No newline at end of file
+on_chroot "systemctl enable regenerate_ssh_host_keys"
diff --git a/stage1/04-sys-tweaks/files/apt/fictionlab.key b/stage1/04-sys-tweaks/files/apt/fictionlab.key
deleted file mode 100644
index 191afcc..0000000
--- a/stage1/04-sys-tweaks/files/apt/fictionlab.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBFz498UBDAClPIjnJ9fcPxcxsdT0F9XkJMRvgM7p7dBbGRps7pcU10n0K8qF
-g8eaCwmuZk9i0iA1ugHYPXQtF5u5cophljSkdi10ui18kdZ469YfVAR1sWs8aPbQ
-S+W/R3PjcMruK8gJJGJwo5LK5cO5Ah7i3tbBOghY1Sgqd84Xi2w/9tMczXoCG/Q3
-SMXfIOKwnhwZpob9m/fHIVj+HJ3cc+XF0mtos4e93sDORWEY0VYOKLJq5iiYjOi7
-2bd4Tb9YrV1GY0cG1ti3/TtO9FbIDTlXo8F5yd6IKJjQSf496VYuq6wadOcZs7/E
-gtM4rIhOivaRHAnT8vTAL7yav17kyT9j8XsispPbJMZGFJsWjbJXAupzDMU6Sj0F
-i7GCHI204kgv7ceuZkz4zoHzWkk6dKh7AHSlzv05F+PbH2QQHcYxeFzU7QJ8xyFP
-LQHAdSWkBu/t+ooWM6GN35/WTeggOuqXG3ZQd8HPDsJBzuQyYUHpeiA2FThmvFhV
-Jc1huZyMoTOgvzEAEQEAAbQmQsWCYcW8ZWogU293YSA8YmxhemVqQHR1cnRsZXJv
-dmVyLmNvbT6JAdQEEwEKAD4WIQSwmBdkMWi2hSjeeL2wcK9jjDMQnQUCXPj3xQIb
-AwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCwcK9jjDMQnVy4C/0Y
-IS5aVqMy43aC908CRAPLlQ8KLo9ZjGNyZ0hO1CgbTkIuleBQxCVRPd+igrx/NZOJ
-ZM5GonOVJOQk1WavXqQ82E2CS42FqOIMMRobLRvPa+nzz+gnei2NfFd+lBxQDxZs
-ptDumgiT0T5sSCL033m9Lps89WvOLm+2vIj74uIJFk4fJSaIVgZWJO/xaSc1/guF
-izMhEDPdaCmrdEyHs2YiwNfnKrRPWNCLKUDHBsz6w1jwYopgsc5qKfD1Dg9g4uW6
-88QPYVj7AeOYIrvul3c1EHmvMJjDYwkSNorera5K4OTiZiM9SFcpEuo8xNHVqp4h
-A3Fk4fN2Ri5xUGQxeG8B8gDbHwE7bIMtBdbusTUkLfFwsKM049PpnKBRSCd9F6fW
-NjXFfiyAVQYF9tMfeXhcEl3XdfzbHuyHNTJRtxkBG6RrbB545Vn41e8XaeDuBcO3
-njOpYW3NIdEkphYZNQCbr923tQW5XJinr4diAFJBdPGXr6Z+XC+wUBM4PEu2ZDC5
-AY0EXPj3xQEMAL1l0FT8r4aw7Bg56lMJ2Xf0fdWMzvboM9hOCMxLjUKa+t64flKy
-IWari6wTABZXmc66or2iOpgZ9+KXXAhlNWscI+aVjLJJCvu36itXNaMPa1SncLCy
-AhxrRGciUj/k5Zhd+e8ZA5nF45J9Ly5beHojaGUQQUbfwvH4tlVLNAw3em0JTsVB
-k5x/2iJ2AfYIlRAvRfWs2AYrFME1TBiQ+zZDh3xZEi0J/+lESUvI6uKo/BVznENi
-Vx/QOX7JVo9DdQiUE/33MGSgKBcZ7srgfjw01yQZiqr38YFpROg1MldVhsCiDbk6
-7eQfhvlxx847/sNTG08Xz4PtICutuB7flez+2gcfZVYmdO9/TCuORi+Q1FQdDRDO
-zdcHI7Bg/RKaTpfdyq1UVtPzJN2EH3FyUttmrnzZK/z8VSs8axJPHUMl0PcPFckf
-xeuIwGd3fD58a7rAytObvd76Z1uHxCtCbgC3h0XMKBLroJiyheGvldG86fnvGsYz
-rbUkBGCpxfCwRwARAQABiQG8BBgBCgAmFiEEsJgXZDFotoUo3ni9sHCvY4wzEJ0F
-Alz498UCGwwFCQPCZwAACgkQsHCvY4wzEJ1RXwv/W18ZdCE7ceiVNjzrAqA7Hbyt
-6vmEDmF2tYEEJQ0BjTR2UKv95RnInwZyBd2QhVgmPV5HuCz6Rdi3ZHjFff3NBBZI
-MZycBVuUdngnj5GdjpmCXyhscaMBWR5Rr06QcQEo4nyNL4JLF0+zuuVUb8bPrtf9
-Lx3QNSVGYZ5SuLPIySNVKeoxnZ6ATr6ygK7LXnm8vWXvTghy7lry2m2GOuB/cAwd
-CkAAomJA8AOG/cLiwumGMlbuDRz1E6pN6nF6fEBXs3RBVz/3hwVDC/cODr0EAqym
-APlAUJNeMrezFgNgC3jHQ9GEXnDAo5ZY7HuI3Y2vpCys5tO6YblYTGVug9oHnjvY
-5Nt2jS0Ks/Zrb9Ok0f9KbhV/od0xOuAUc1qb/uDWxGlrs1BxrCCkCEOq1u9QCFfI
-+pEA10yK/B4cmDpWgtv6heNNrYgMJMra8aj1U94bQry0HnJUSEHVf7HJiLJDg2AU
-rSdGusF7fiUohV9OgVSmXtchjQH34t+VPGJQ//Yr
-=Nw+C
------END PGP PUBLIC KEY BLOCK-----