Commit 0a533354 authored by intrigeri's avatar intrigeri
Browse files

Drop Icedove → Thunderbird migration code.

We've done the switch a year ago, in Tails 3.0, and #15693 shows
that this migration code causes issues, so let's get rid of it.

Besides, I have a hunch that this code is the only possible rationale
explanation for the dreaded "empty persistence.conf file" problem, putting aside
user intervention: it's the only piece of code we have, apart of the Tails
Persistence Setup wizard that affected users tell they did not use, that
modifies persistence.conf (refs: #10976).
parent 45925bdb
......@@ -34,21 +34,6 @@ start_thunderbird() {
configure_default_incoming_protocol
# Apply only the relevant parts of Debian's Icedove → Thunderbird
# migration procedure.
TB_PROFILE_FOLDER="${THUNDERBIRD_CONFIG_DIR}"
if [ ! -f "${TB_PROFILE_FOLDER}/.migrated" ]; then
# Debian's migration helpers are not designed to have set -e
# or -u enabled.
set +e
set +u
. /usr/lib/thunderbird/thunderbird-wrapper-helper.sh
do_fix_mimetypes_rdf
do_create_migrated_mark_file
set -e
set -u
fi
exec /usr/bin/thunderbird --class "Thunderbird" -profile "${PROFILE}" "${@}"
}
......
......@@ -128,21 +128,6 @@ migrate_persistence_preset()
fi
}
migrate_icedove_to_thunderbird() {
local CONFIG="${1}"
local PERSISTENCE_DIR="$(dirname "${CONFIG}")"
if [ -d "${PERSISTENCE_DIR}/thunderbird" ] || \
! [ -d "${PERSISTENCE_DIR}/icedove" ]
then
return
fi
mv "${PERSISTENCE_DIR}/icedove" "${PERSISTENCE_DIR}/thunderbird"
add_persistence_preset /home/amnesia/.thunderbird thunderbird "${conf}"
remove_persistence_preset /home/amnesia/.icedove "${conf}"
# The script /usr/local/bin/thunderbird takes care of the rest of
# the migration when starting Thunderbird.
}
# We override live-boot's logging facilities to get more useful error messages
log_warning_msg ()
{
......@@ -384,12 +369,6 @@ activate_volumes ()
fi
done
# Migrate persistence settings
for conf in $(ls /live/persistence/*_unlocked/persistence.conf || true)
do
migrate_icedove_to_thunderbird "${conf}"
done
# Fix permissions on persistent directories that were created
# with unsafe permissions.
for persistent_fs in $(ls -d /live/persistence/*_unlocked || true)
......
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