From b289bd05dfd99a5f2087e1e1f6a132b3c91143df Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Jun 2023 17:31:22 +0200
Subject: [remote-access/tigervnc] tigervncpasswd

---
 .../remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver        | 2 +-
 core/modules/tigervnc/module.conf                                  | 2 +-
 core/modules/tigervnc/module.conf.fedora                           | 7 -------
 core/modules/tigervnc/module.conf.opensuse                         | 7 -------
 4 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 core/modules/tigervnc/module.conf.fedora
 delete mode 100644 core/modules/tigervnc/module.conf.opensuse

diff --git a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
index 2a5ced0f..f168d55a 100755
--- a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
+++ b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
@@ -53,7 +53,7 @@
 			trap 'exit 1' INT TERM
 			trap 'rm -f -- "$copy"' EXIT
 		fi
-		< "$t/vnc-passwd"  vncpasswd -f  > "$t/tigervnc-passwd"
+		< "$t/vnc-passwd"  tigervncpasswd -f  > "$t/tigervnc-passwd"
 		fails=0
 		while true; do
 			s="$( date +%s )"
diff --git a/core/modules/tigervnc/module.conf b/core/modules/tigervnc/module.conf
index 4149438d..fc3d4c64 100644
--- a/core/modules/tigervnc/module.conf
+++ b/core/modules/tigervnc/module.conf
@@ -1,8 +1,8 @@
 #!/bin/bash
 REQUIRED_BINARIES="
 	X0tigervnc
+	tigervncpasswd
 	x0tigervncserver
-	vncpasswd
 "
 REQUIRED_DIRECTORIES="
 	/etc/tigervnc
diff --git a/core/modules/tigervnc/module.conf.fedora b/core/modules/tigervnc/module.conf.fedora
deleted file mode 100644
index 1ca43771..00000000
--- a/core/modules/tigervnc/module.conf.fedora
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	x11vnc
-"
-REQUIRED_CONTENT_PACKAGES="
-	x11vnc
-"
diff --git a/core/modules/tigervnc/module.conf.opensuse b/core/modules/tigervnc/module.conf.opensuse
deleted file mode 100644
index 798e2c3b..00000000
--- a/core/modules/tigervnc/module.conf.opensuse
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-  x11vnc
-"
-REQUIRED_CONTENT_PACKAGES="
-  x11vnc
-"
-- 
cgit v1.2.3-55-g7522