Commit c27376df authored by Tails developers's avatar Tails developers

Consistently use "upgrade" instead of "update".

parent 3ff5a353
......@@ -2,12 +2,12 @@
set -e
# Create the tails-update-frontend user.
# Create the tails-upgrade-frontend user.
#
# The tails-update-frontend program may be run as this user.
# The tails-upgrade-frontend program may be run as this user.
# This avoids having to grant the desktop user the right to install
# any arbitrary IUK.
echo "creating the tails-update-frontend user"
echo "creating the tails-upgrade-frontend user"
adduser --system --quiet --group --no-create-home tails-update-frontend
adduser --system --quiet --group --no-create-home tails-upgrade-frontend
......@@ -4,7 +4,7 @@ set -e
echo "Registering menus"
for app in liveusb-creator-launcher tails-persistence-delete tails-persistence-setup tails-updater ; do
for app in liveusb-creator-launcher tails-persistence-delete tails-persistence-setup tails-upgrader ; do
xdg-desktop-menu install --novendor \
/usr/share/desktop-directories/Tails.directory \
"/usr/share/applications/${app}.desktop"
......
Cmnd_Alias INSTALL_IUK = /bin/chmod, /bin/cp, /bin/mkdir, /bin/mktemp, /bin/mount, /bin/rm, /bin/tar
Cmnd_Alias IUK_GET_TARGET_FILE = /usr/bin/tails-iuk-get-target-file
Cmnd_Alias UPDATE_FRONTEND = /usr/bin/tails-update-frontend
Cmnd_Alias UPGRADE_FRONTEND = /usr/bin/tails-upgrade-frontend
Defaults!IUK_GET_TARGET_FILE env_keep+="HARNESS_ACTIVE DISABLE_PROXY"
Defaults!UPDATE_FRONTEND env_keep+="DISABLE_PROXY SSL_NO_VERIFY"
Defaults!UPGRADE_FRONTEND env_keep+="DISABLE_PROXY SSL_NO_VERIFY"
amnesia ALL = (tails-update-frontend) NOPASSWD: UPDATE_FRONTEND
tails-update-frontend ALL = NOPASSWD: /usr/bin/tails-shutdown-network
tails-update-frontend ALL = (tails-install-iuk) NOPASSWD: /usr/bin/tails-install-iuk
tails-update-frontend ALL = (tails-iuk-get-target-file) NOPASSWD: IUK_GET_TARGET_FILE
tails-update-frontend ALL = (tails-iuk-get-target-file) NOPASSWD: /usr/bin/tails-iuk-mktemp-get-target-file
tails-update-frontend ALL = NOPASSWD: /sbin/reboot
amnesia ALL = (tails-upgrade-frontend) NOPASSWD: UPGRADE_FRONTEND
tails-upgrade-frontend ALL = NOPASSWD: /usr/bin/tails-shutdown-network
tails-upgrade-frontend ALL = (tails-install-iuk) NOPASSWD: /usr/bin/tails-install-iuk
tails-upgrade-frontend ALL = (tails-iuk-get-target-file) NOPASSWD: IUK_GET_TARGET_FILE
tails-upgrade-frontend ALL = (tails-iuk-get-target-file) NOPASSWD: /usr/bin/tails-iuk-mktemp-get-target-file
tails-upgrade-frontend ALL = NOPASSWD: /sbin/reboot
tails-install-iuk ALL = NOPASSWD: INSTALL_IUK
......@@ -11,7 +11,7 @@ TORDATE_DONE_FILE="${TORDATE_DIR}/done"
INOTIFY_TIMEOUT=60
MIN_MEMFREE=$((200 * 1024))
MIN_TOTAL_MEMFREE=$((500 * 1024))
RUN_AS_USER=tails-update-frontend
RUN_AS_USER=tails-upgrade-frontend
### Functions
......@@ -37,9 +37,9 @@ check_free_memory () {
cached=$(awk '/^Cached:/{print $2}' /proc/meminfo)
total_memfree=$(($memfree + $buffers + $cached))
errormsg="`gettext \"Not enough memory to check if updates are available.
errormsg="`gettext \"Not enough memory to check if an upgrade is available.
Make sure this system satisfies the <a href='file:///usr/share/doc/tails/website/doc/about/requirements/index.en.html'>Tails requirements</a>, try to restart and run <b>Applications</b> -> <b>Tails</b> -> <b>Tails Updater</b>.\"`"
Make sure this system satisfies the <a href='file:///usr/share/doc/tails/website/doc/about/requirements/index.en.html'>Tails requirements</a>, try to restart and run <b>Applications</b> -> <b>Tails</b> -> <b>Tails Upgrader</b>.\"`"
if [ "$memfree" -lt "$MIN_MEMFREE" ] ; then
echo "Only $memfree MemFree, while $MIN_MEMFREE is needed." >&2
......@@ -67,5 +67,5 @@ done
check_free_memory "$MIN_MEMFREE" "$MIN_TOTAL_MEMFREE"
xhost +SI:localuser:"$RUN_AS_USER"
gksudo -u "$RUN_AS_USER" "/usr/bin/tails-update-frontend [email protected]"
gksudo -u "$RUN_AS_USER" "/usr/bin/tails-upgrade-frontend [email protected]"
xhost -SI:localuser:"$RUN_AS_USER"
[Desktop Entry]
Type=Application
Name=Tails Updater
Name=Tails Upgrader
Comment=Make sure Tails is up-to-date
Icon=system-software-update.png
Exec=tails-update-frontend-wrapper
Exec=tails-upgrade-frontend-wrapper
Terminal=false
Categories=System;Tails;
StartupNotify=false
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