summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/lib
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-08-29 17:06:28 +0000
committerintrigeri <intrigeri@boum.org>2019-08-29 17:06:28 +0000
commit4e0a3232e06e87756c63623f7436533b72b67167 (patch)
tree90fff2a7d200b1f79e4a5c0d38ec3bc39353e4ba /config/chroot_local-includes/lib
parentc6c5c63b7798c86b9a6701272fdba8425333f447 (diff)
parent6aa06ccd833d3a8cc88a8e2b1b65cf993096c69f (diff)
Merge remote-tracking branch 'origin/devel' into feature/16664-simplify-tor-has-bootstrapped+run-all-tests
Diffstat (limited to 'config/chroot_local-includes/lib')
-rwxr-xr-xconfig/chroot_local-includes/lib/live/config/1500-reconfigure-APT2
-rwxr-xr-xconfig/chroot_local-includes/lib/live/config/2010-pidgin63
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-gdm-failed-to-start.service4
3 files changed, 2 insertions, 67 deletions
diff --git a/config/chroot_local-includes/lib/live/config/1500-reconfigure-APT b/config/chroot_local-includes/lib/live/config/1500-reconfigure-APT
index 60c6887..2212fec 100755
--- a/config/chroot_local-includes/lib/live/config/1500-reconfigure-APT
+++ b/config/chroot_local-includes/lib/live/config/1500-reconfigure-APT
@@ -107,7 +107,7 @@ s{
^
(Pin:\s+release\s+)
o=Debian
- (,[an]=stretch-backports)
+ (,[an]=buster-backports)
$
}{$1o=Debian Backports$2}xms;
' | perl -pi - /etc/apt/preferences
diff --git a/config/chroot_local-includes/lib/live/config/2010-pidgin b/config/chroot_local-includes/lib/live/config/2010-pidgin
deleted file mode 100755
index df5f2f9..0000000
--- a/config/chroot_local-includes/lib/live/config/2010-pidgin
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# List of at least 2000 possible nicknames
-NICKS_LIST=/usr/share/tails/firstnames.txt
-
-# returns true with probability $1
-prob()
-{
- # sh doesn't have bash's $RANDOM, so we implement it
- RANDOM=$(expr $(od -Anv -N4 -tu4 /dev/urandom) % 32768)
- # we compare with > instead of <= due to mismatch between bash and bc
- # on what values true and false have.
- return $(echo "scale = 10; ${RANDOM}/32767 > ${1}" | bc)
-}
-
-leet_nick()
-{
- # we leave the first letter due to restrictions on nicks in IRC
- first=$(expr substr ${1} 1 1)
- rest=${1#?}
- rest=$(echo "${rest}" | tr 'e' '3' | tr 'i' '1' | tr 'o' '0')
- echo "${first}${rest}"
-}
-
-generate_nick()
-{
- NICK=$(/usr/local/bin/lc.py -g 1 --min 4 --max 10 "${NICKS_LIST}")
-
- if prob 0.90; then
- NICK=$(echo "${NICK}" | tr '[:upper:]' '[:lower:]')
- fi
-
- if prob 0.05; then
- if prob 0.50; then
- NICK="${NICK}_"
- else
- NICK="${NICK}^"
- fi
- fi
-
- if prob 0.05; then
- NICK=$(leet_nick "${NICK}")
- fi
-
- echo ${NICK}
-}
-
-Configure_pidgin ()
-{
-
- echo "- configuring Pidgin"
-
- NICK=$(generate_nick)
-
- for file in accounts.xml blist.xml ; do
- sudo -H -u "${LIVE_USERNAME}" sed -i'' "s,XXX_NICK_XXX,${NICK}," "/home/${LIVE_USERNAME}/.purple/${file}"
- done
-
- # Creating state file
- touch /var/lib/live/config/pidgin
-}
-
-Configure_pidgin
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-gdm-failed-to-start.service b/config/chroot_local-includes/lib/systemd/system/tails-gdm-failed-to-start.service
index ae598f8..c7632de 100644
--- a/config/chroot_local-includes/lib/systemd/system/tails-gdm-failed-to-start.service
+++ b/config/chroot_local-includes/lib/systemd/system/tails-gdm-failed-to-start.service
@@ -20,9 +20,7 @@ Type=oneshot
# watch_for_coldplug_completion will set up a watcher and return before
# there's any place where plymouthd can create a seat to display its
# splash and messages on. So we tell plymouthd to ignore udev which makes
-# it create a fallback seat.
-# XXX:Buster: check if plymouth.ignore-udev is still necessary (this code path
-# has changed in plymouth 0.9.3)
+# it create a fallback seat. The removal of this hack is tracked on #16964.
ExecStart=/bin/sh -c \
'/sbin/plymouthd --mode=shutdown --tty=tty5 \
--kernel-command-line="plymouth.ignore-udev $(cat /proc/cmdline)"'