From f32cc6462c86c578f4b5956c408bf5175253271d Mon Sep 17 00:00:00 2001 From: Stefan Venz Date: Mon, 10 Apr 2023 22:51:19 +0200 Subject: [PATCH] novnc: Fix #13 Signed-off-by: Stefan Venz --- Makefile | 2 +- blackarch-novnc/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b6508fa..1f8c584 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ define rootfs cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/ -fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust + fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate archlinux blackarch && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"' diff --git a/blackarch-novnc/Dockerfile b/blackarch-novnc/Dockerfile index 7245a9e..2049b42 100644 --- a/blackarch-novnc/Dockerfile +++ b/blackarch-novnc/Dockerfile @@ -14,13 +14,14 @@ FROM blackarchlinux/blackarch:latest # hostapd-wpe needs make, but it's not a dep because it's assumed to be installed despite not being a dep RUN pacman -Syu --noconfirm make && \ # Install packages - pacman -Syu --noconfirm openssh vim tmux screen supervisor iw man mlocate pciutils less bash-completion novnc \ + pacman -Syu --noconfirm openssh git vim tmux screen supervisor iw man mlocate pciutils less bash-completion novnc \ xorg-server-xvfb x11vnc xfce4 xfce4-goodies xfce4-power-manager blackarch-config-xfce blackarch-menus blackarch-wallpaper \ blackarch-config-cursor blackarch-config-icons blackarch-config-zsh ttf-liberation && \ # Point wallpaper to the right files sed -i 's/backgrounds\/blackarch.png/blackarch\/wallpaper.png/g' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml && \ # Copy BlackArch configs cp -r /etc/skel/. /root/. && \ + rm -f /usr/bin/websockify && \ echo 'root:blackarch' | chpasswd && \ echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config