Commit e7168fb2 authored by Tails developers's avatar Tails developers

run_browser_in_chroot() is a better name.

parent aedacbd3
...@@ -105,7 +105,7 @@ set_chroot_browser_name () { ...@@ -105,7 +105,7 @@ set_chroot_browser_name () {
} }
# Start the browser in the chroot # Start the browser in the chroot
run_chroot_browser () { run_browser_in_chroot () {
local chroot="${1}" local chroot="${1}"
local browser_name="${2}" local browser_name="${2}"
local chroot_user="${3}" local chroot_user="${3}"
......
...@@ -12,7 +12,7 @@ set -e ...@@ -12,7 +12,7 @@ set -e
# configure_chroot_dns_servers(), configure_chroot_browser(), # configure_chroot_dns_servers(), configure_chroot_browser(),
# configure_chroot_browser(), set_chroot_browser_locale() # configure_chroot_browser(), set_chroot_browser_locale()
# set_chroot_torbutton_browser_name(), set_chroot_browser_permissions() # set_chroot_torbutton_browser_name(), set_chroot_browser_permissions()
# and run_chroot_browser(). # and run_browser_in_chroot().
. /usr/local/lib/tails-shell-library/chroot-browser.sh . /usr/local/lib/tails-shell-library/chroot-browser.sh
# Import i2p_router_console_is_ready() and i2p_is_enabled(). # Import i2p_router_console_is_ready() and i2p_is_enabled().
...@@ -124,7 +124,7 @@ set_chroot_browser_permissions "${CHROOT}" "${BROWSER_NAME}" \ ...@@ -124,7 +124,7 @@ set_chroot_browser_permissions "${CHROOT}" "${BROWSER_NAME}" \
error "`gettext \"Failed to configure browser.\"`" error "`gettext \"Failed to configure browser.\"`"
echo "* Starting I2P Browser" echo "* Starting I2P Browser"
run_chroot_browser "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \ run_browser_in_chroot "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
"${SUDO_USER}" || \ "${SUDO_USER}" || \
error "`gettext \"Failed to run browser.\"`" error "`gettext \"Failed to run browser.\"`"
......
...@@ -15,7 +15,7 @@ set -e ...@@ -15,7 +15,7 @@ set -e
# configure_chroot_dns_servers(), configure_chroot_browser(), # configure_chroot_dns_servers(), configure_chroot_browser(),
# configure_chroot_browser(), set_chroot_browser_locale() # configure_chroot_browser(), set_chroot_browser_locale()
# set_chroot_browser_name(), set_chroot_browser_permissions() # set_chroot_browser_name(), set_chroot_browser_permissions()
# and run_chroot_browser(). # and run_browser_in_chroot().
. /usr/local/lib/tails-shell-library/chroot-browser.sh . /usr/local/lib/tails-shell-library/chroot-browser.sh
error () { error () {
...@@ -135,7 +135,7 @@ set_chroot_browser_permissions "${CHROOT}" "${BROWSER_NAME}" \ ...@@ -135,7 +135,7 @@ set_chroot_browser_permissions "${CHROOT}" "${BROWSER_NAME}" \
error "`gettext \"Failed to configure browser.\"`" error "`gettext \"Failed to configure browser.\"`"
echo "* Starting Unsafe Browser" echo "* Starting Unsafe Browser"
run_chroot_browser "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \ run_browser_in_chroot "${CHROOT}" "${BROWSER_NAME}" "${BROWSER_USER}" \
"${SUDO_USER}" || \ "${SUDO_USER}" || \
error "`gettext \"Failed to run browser.\"`" error "`gettext \"Failed to run browser.\"`"
......
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