From 89efc53dfdb6303362efb9310f5662fa964a2889 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Thu, 9 Jul 2020 12:09:37 +0200
Subject: [PATCH] checktrust: Rename lightdm related files

Rename files related to lighdm so that they are prefixed with
"lightdm-" and move all files into single source directory.
---
 checktrust/lightdm-greeter-wrapper                          | 3 +++
 .../lightdm-show-trust-warning                              | 0
 checktrust/lightdm-use-wrapper.conf                         | 2 ++
 install.sh                                                  | 6 +++---
 lightdm/50-use-wrapper.conf                                 | 2 --
 lightdm/greeter-wrapper                                     | 3 ---
 6 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100755 checktrust/lightdm-greeter-wrapper
 rename lightdm/show-trust-warning => checktrust/lightdm-show-trust-warning (100%)
 create mode 100644 checktrust/lightdm-use-wrapper.conf
 delete mode 100644 lightdm/50-use-wrapper.conf
 delete mode 100755 lightdm/greeter-wrapper

diff --git a/checktrust/lightdm-greeter-wrapper b/checktrust/lightdm-greeter-wrapper
new file mode 100755
index 00000000..1e47adaf
--- /dev/null
+++ b/checktrust/lightdm-greeter-wrapper
@@ -0,0 +1,3 @@
+#! /bin/bash
+(/usr/libexec/lightdm-show-trust-warning &)
+exec "$@"
diff --git a/lightdm/show-trust-warning b/checktrust/lightdm-show-trust-warning
similarity index 100%
rename from lightdm/show-trust-warning
rename to checktrust/lightdm-show-trust-warning
diff --git a/checktrust/lightdm-use-wrapper.conf b/checktrust/lightdm-use-wrapper.conf
new file mode 100644
index 00000000..80af383f
--- /dev/null
+++ b/checktrust/lightdm-use-wrapper.conf
@@ -0,0 +1,2 @@
+[Seat:*]
+greeter-wrapper=/usr/libexec/lightdm-greeter-wrapper
diff --git a/install.sh b/install.sh
index 05245151..26874529 100755
--- a/install.sh
+++ b/install.sh
@@ -167,9 +167,9 @@ install_data crashkernel/crashkernel.service              "$DESTDIR$systemdunitd
 install_exec crashkernel/crash-recovery.sh                "$DESTDIR$root_sbindir/crash-recovery.sh"
 install_data misc_systemd_units/admin-sshd.service        "$DESTDIR$systemdunitdir/admin-sshd.service"
 mkdir -p "$DESTDIR$sysconfdir/xdg/lightdm/lightdm.conf.d"
-install_data lightdm/50-use-wrapper.conf                  "$DESTDIR$sysconfdir/xdg/lightdm/lightdm.conf.d/50-use-wrapper.conf"
-install_exec lightdm/greeter-wrapper                      "$DESTDIR$usr_exec_prefix/libexec/greeter-wrapper"
-install_exec lightdm/show-trust-warning                   "$DESTDIR$usr_exec_prefix/libexec/show-trust-warning"
+install_data checktrust/lightdm-use-wrapper.conf          "$DESTDIR$sysconfdir/xdg/lightdm/lightdm.conf.d/50-use-wrapper.conf"
+install_exec checktrust/lightdm-greeter-wrapper           "$DESTDIR$usr_exec_prefix/libexec/lightdm-greeter-wrapper"
+install_exec checktrust/lightdm-show-trust-warning        "$DESTDIR$usr_exec_prefix/libexec/lightdm-show-trust-warning"
 mkdir -p "$DESTDIR$sysconfdir/issue.d/"
 install_symlink /node/issue.d/notrust.issue               "$DESTDIR$sysconfdir/issue.d/notrust.issue"
 install_data checktrust/getty-checktrust.service          "$DESTDIR$systemdunitdir/getty-checktrust.service"
diff --git a/lightdm/50-use-wrapper.conf b/lightdm/50-use-wrapper.conf
deleted file mode 100644
index ffaedd2c..00000000
--- a/lightdm/50-use-wrapper.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Seat:*]
-greeter-wrapper=/usr/libexec/greeter-wrapper
diff --git a/lightdm/greeter-wrapper b/lightdm/greeter-wrapper
deleted file mode 100755
index 130680b2..00000000
--- a/lightdm/greeter-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-(/usr/libexec/show-trust-warning &)
-exec "$@"