Commit 4e5faa95 authored by amnesia's avatar amnesia
Browse files

Disable Tor automatic startup at build time rather than at boot time.

parent af9a0c0c
......@@ -11,7 +11,7 @@
# sourced by various other scripts.
# Base for the string that will be passed to "lh config --bootappend-live"
AMNESIA_APPEND="quiet splash vga=788 live-media=removable nopersistent noprompt=usb sysv-rc=tor"
AMNESIA_APPEND="quiet splash vga=788 live-media=removable nopersistent noprompt=usb"
# Options passed to isohybrid
# Default: "-entry 4 -type 1c"
......
#!/bin/sh
# Manage initscripts
# Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
# Get LH_DISTRIBUTION
Read_conffiles config/bootstrap
# Setting static variables
DESCRIPTION="$(Echo 'managing initscripts')"
HELP=""
USAGE="${PROGRAM}"
Set_defaults
Echo_message "managing initscripts"
disable_service () {
local INITSCRIPT="$1"
case "${LH_DISTRIBUTION}" in
squeeze|sid)
update-rc.d ${INITSCRIPT} disable
;;
*)
for startlink in /etc/rc[S2-5].d/S[0-9][0-9]${INITSCRIPT} ; do
stoplink=`echo "${startlink}" | sed -e 's,^\(/etc/rc[S2-5].d/\)S,\1K,'`
mv "${startlink}" "${stoplink}"
done
;;
esac
}
# we run Tor ourselves after HTP via NetworkManager hooks
disable_service tor
......@@ -17,13 +17,17 @@ PIDFILE=/var/run/tor/tor.pid
# We don't start Tor automatically anymore so *this* is the time when
# it is supposed to start.
# Note: as we disabled the initscript automatic startup, we cannot use
# invoke-rc.d: it would silently ignore our request. That's why we use
# the good old direct initscript invocation rather than any fancy
# frontend.
if [ -r "${PIDFILE}" ]; then
# A SIGHUP should be enough but there's a bug in Tor. Details:
# * https://bugs.torproject.org/flyspray/index.php?do=details&id=1247
# * https://amnesia.boum.org/bugs/tor_vs_networkmanager/
invoke-rc.d tor restart
/etc/init.d/tor restart
else
invoke-rc.d tor start
/etc/init.d/tor start
fi
# Restart Vidalia because it does not automatically reconnect to the new
......
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