Commit cbb6b631 authored by geb's avatar geb Committed by intrigeri

Ensure MAC spoofing messages are translated (refs: #17783)

As tails-spoof-mac is running as root, its messages cannot be translated
according to the user settings. This commit solves this problem by reading the
localization settings from the environment (/etc/default/locale) in
tails-spoof-mac initialization. To make this work, we also set up the desired
localization environment before launching tails-unblock-network and
tails-spoof-mac.
parent f7726cdf
...@@ -82,11 +82,6 @@ if [ -z "${LIVE_USERNAME}" ] ; then ...@@ -82,11 +82,6 @@ if [ -z "${LIVE_USERNAME}" ] ; then
log_n_exit "Username variable not found." log_n_exit "Username variable not found."
fi fi
### Physical security
log "Running /usr/local/lib/tails-unblock-network..."
/usr/local/lib/tails-unblock-network
log "tails-unblock-network has exited (status=$?)."
### Localization ### Localization
# Import locale settings # Import locale settings
...@@ -125,6 +120,11 @@ XKBVARIANT="$TAILS_XKBVARIANT" ...@@ -125,6 +120,11 @@ XKBVARIANT="$TAILS_XKBVARIANT"
XKBOPTIONS="$TAILS_XKBOPTIONS" XKBOPTIONS="$TAILS_XKBOPTIONS"
EOF EOF
### Physical security
log "Running /usr/local/lib/tails-unblock-network..."
/usr/local/lib/tails-unblock-network
log "tails-unblock-network has exited (status=$?)."
### Password ### Password
# Import password for superuser access # Import password for superuser access
......
...@@ -14,6 +14,10 @@ set -u ...@@ -14,6 +14,10 @@ set -u
# Get LIVE_USERNAME # Get LIVE_USERNAME
. /etc/live/config.d/username.conf . /etc/live/config.d/username.conf
# Get LANG
. /etc/default/locale
export LANG
. /usr/bin/gettext.sh . /usr/bin/gettext.sh
TEXTDOMAIN="tails" TEXTDOMAIN="tails"
export TEXTDOMAIN export TEXTDOMAIN
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment