summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsegfault <segfault@riseup.net>2019-09-25 23:18:12 +0200
committersegfault <segfault@riseup.net>2019-10-01 23:25:52 +0200
commitb94b3550c1653efdfa84696b209b9d92abdf8c7e (patch)
tree2cca02fbc7c4fcf8d130ebd7714f5aa841d862b0
parent3801bd06a0dedb7c06c1dec7780ee33a4719ba1d (diff)
Move /usr/share/tails-greeter to /usr/share/tails/greeter
-rwxr-xr-xconfig/chroot_local-includes/etc/gdm3/PostLogin/Default2
-rw-r--r--config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/replace-su-with-sudo2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-greeter4
-rw-r--r--config/chroot_local-includes/usr/share/tails/greeter/greeter.css (renamed from config/chroot_local-includes/usr/share/tails-greeter/greeter.css)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/greeter/greeter.ui (renamed from config/chroot_local-includes/usr/share/tails-greeter/greeter.ui)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/greeter/language_codes (renamed from config/chroot_local-includes/usr/share/tails-greeter/language_codes)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/greeter/no-password-lecture.txt (renamed from config/chroot_local-includes/usr/share/tails-greeter/no-password-lecture.txt)0
-rwxr-xr-xconfig/chroot_local-includes/usr/share/tails/greeter/set-cursor.py (renamed from config/chroot_local-includes/usr/share/tails-greeter/set-cursor.py)0
-rwxr-xr-xconfig/chroot_local-includes/usr/share/tails/greeter/tails-greeter.py (renamed from config/chroot_local-includes/usr/share/tails-greeter/tails-greeter.py)0
-rw-r--r--config/chroot_local-includes/usr/share/tails/greeter/tails-logging.conf (renamed from config/chroot_local-includes/usr/share/tails-greeter/tails-logging.conf)0
-rw-r--r--po/POTFILES.skip2
-rwxr-xr-xrefresh-translations2
13 files changed, 7 insertions, 7 deletions
diff --git a/config/chroot_local-includes/etc/gdm3/PostLogin/Default b/config/chroot_local-includes/etc/gdm3/PostLogin/Default
index 5d9c717..0722b7e 100755
--- a/config/chroot_local-includes/etc/gdm3/PostLogin/Default
+++ b/config/chroot_local-includes/etc/gdm3/PostLogin/Default
@@ -127,7 +127,7 @@ if [ -z "${TAILS_USER_PASSWORD}" ] ; then
passwd -d "${LIVE_USERNAME}"
install -o root -g root -m 0440 /dev/null "${NO_PASSWORD_LECTURE}"
echo "Defaults:amnesia lecture=always" > "${NO_PASSWORD_LECTURE}"
- echo "Defaults:amnesia lecture_file=/usr/share/tails-greeter/no-password-lecture.txt" >> "${NO_PASSWORD_LECTURE}"
+ echo "Defaults:amnesia lecture_file=/usr/share/tails/greeter/no-password-lecture.txt" >> "${NO_PASSWORD_LECTURE}"
echo "Defaults:amnesia badpass_message=\"The administration password is disabled.\"" >> "${NO_PASSWORD_LECTURE}"
log_n_exit "Password variable not found."
fi
diff --git a/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py
index 5f17552..8c7fe3b 100644
--- a/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py
+++ b/config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/config.py
@@ -24,7 +24,7 @@ LPASSWORD = 'live'
LUSER = 'amnesia'
# data path
-data_path = '/usr/share/tails-greeter/'
+data_path = '/usr/share/tails/greeter/'
# File containing the language codes that are supported by the greeter
language_codes_path = os.path.join(data_path, 'language_codes')
diff --git a/config/chroot_local-includes/usr/local/bin/replace-su-with-sudo b/config/chroot_local-includes/usr/local/bin/replace-su-with-sudo
index 33e7142..a793364 100755
--- a/config/chroot_local-includes/usr/local/bin/replace-su-with-sudo
+++ b/config/chroot_local-includes/usr/local/bin/replace-su-with-sudo
@@ -21,7 +21,7 @@ def main() -> None:
print(_('su is disabled. Please use sudo instead.'))
sys.exit(0)
else:
- print(open("/usr/share/tails-greeter/no-password-lecture.txt").read())
+ print(open("/usr/share/tails/greeter/no-password-lecture.txt").read())
sys.exit(1)
if __name__ == "__main__":
diff --git a/config/chroot_local-includes/usr/local/lib/tails-greeter b/config/chroot_local-includes/usr/local/lib/tails-greeter
index 9e3b4fa..a7ade34 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-greeter
+++ b/config/chroot_local-includes/usr/local/lib/tails-greeter
@@ -1,5 +1,5 @@
#!/bin/bash
-cd /usr/share/tails-greeter/
+cd /usr/share/tails/greeter/
export LANG="en_US.UTF-8"
-/usr/share/tails-greeter/set-cursor.py watch
+/usr/share/tails/greeter/set-cursor.py watch
/usr/bin/python3 ./tails-greeter.py "$@"
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/greeter.css b/config/chroot_local-includes/usr/share/tails/greeter/greeter.css
index 52bfcd3..52bfcd3 100644
--- a/config/chroot_local-includes/usr/share/tails-greeter/greeter.css
+++ b/config/chroot_local-includes/usr/share/tails/greeter/greeter.css
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/greeter.ui b/config/chroot_local-includes/usr/share/tails/greeter/greeter.ui
index 5249aba..5249aba 100644
--- a/config/chroot_local-includes/usr/share/tails-greeter/greeter.ui
+++ b/config/chroot_local-includes/usr/share/tails/greeter/greeter.ui
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/language_codes b/config/chroot_local-includes/usr/share/tails/greeter/language_codes
index 0b161b7..0b161b7 100644
--- a/config/chroot_local-includes/usr/share/tails-greeter/language_codes
+++ b/config/chroot_local-includes/usr/share/tails/greeter/language_codes
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/no-password-lecture.txt b/config/chroot_local-includes/usr/share/tails/greeter/no-password-lecture.txt
index 11f49e2..11f49e2 100644
--- a/config/chroot_local-includes/usr/share/tails-greeter/no-password-lecture.txt
+++ b/config/chroot_local-includes/usr/share/tails/greeter/no-password-lecture.txt
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/set-cursor.py b/config/chroot_local-includes/usr/share/tails/greeter/set-cursor.py
index 3037f0e..3037f0e 100755
--- a/config/chroot_local-includes/usr/share/tails-greeter/set-cursor.py
+++ b/config/chroot_local-includes/usr/share/tails/greeter/set-cursor.py
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/tails-greeter.py b/config/chroot_local-includes/usr/share/tails/greeter/tails-greeter.py
index 643e5ef..643e5ef 100755
--- a/config/chroot_local-includes/usr/share/tails-greeter/tails-greeter.py
+++ b/config/chroot_local-includes/usr/share/tails/greeter/tails-greeter.py
diff --git a/config/chroot_local-includes/usr/share/tails-greeter/tails-logging.conf b/config/chroot_local-includes/usr/share/tails/greeter/tails-logging.conf
index f61b064..f61b064 100644
--- a/config/chroot_local-includes/usr/share/tails-greeter/tails-logging.conf
+++ b/config/chroot_local-includes/usr/share/tails/greeter/tails-logging.conf
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index ad1a075..f2c7c77 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -5,7 +5,7 @@ config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persiste
config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py
config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py
config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py
-config/chroot_local-includes/usr/share/tails-greeter/greeter.ui
+config/chroot_local-includes/usr/share/tails/greeter/greeter.ui
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui
config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui
config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui
diff --git a/refresh-translations b/refresh-translations
index 1735884..083c21f 100755
--- a/refresh-translations
+++ b/refresh-translations
@@ -33,7 +33,7 @@ JAVASCRIPT_PROGS=" \
/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js \
"
GLADE_UI="\
- /usr/share/tails-greeter/greeter.ui \
+ /usr/share/tails/greeter/greeter.ui \
/usr/share/tails/additional-software/configuration-window.ui \
"