Tell users about the init script when they try to run Tor as root.imported-from-cvs

Should we also do this when they try to run their Tor as any other
(non root, non debian-tor) user? - add 11_tor_as_root_more_helpful


svn:r6822

3 files changed, 41 insertions, 1 deletions

diff --git a/trunk/debian/changelog b/trunk/debian/changelog
index 8b0df71d27..df2071f67b 100644
--- a/trunk/debian/changelog
+++ b/trunk/debian/changelog
@@ -7,8 +7,11 @@ tor (0.1.2.0-alpha-cvs-1) unstable; urgency=low
     our own DataDirectory and all) only when run as the debian-tor user.
     If invoked as any other user, Tor will behave just like the pristine
     upstream version.
+  * Tell users about the init script when they try to run Tor as root.
+    Should we also do this when they try to run their Tor as any other
+    (non root, non debian-tor) user? - add 11_tor_as_root_more_helpful
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 24 Jul 2006 05:21:00 +0200
+ -- Peter Palfrader <weasel@debian.org>  Mon, 24 Jul 2006 05:37:17 +0200
 
 tor (0.1.1.21-1) unstable; urgency=low
 
diff --git a/trunk/debian/patches/00list b/trunk/debian/patches/00list
index cd17cd1dca..0c2be8424f 100644
--- a/trunk/debian/patches/00list
+++ b/trunk/debian/patches/00list
@@ -2,3 +2,4 @@
 03_tor_manpage_in_section_8.dpatch
 06_add_compile_time_defaults.dpatch
 07_log_to_file_by_default.dpatch
+11_tor_as_root_more_helpful.dpatch
diff --git a/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch b/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch
new file mode 100755
index 0000000000..96e42d5316
--- /dev/null
+++ b/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+## 08_no_run_as_root.dpatch by  <weasel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- tor~/src/or/main.c	2006-07-23 19:31:29.000000000 +0200
++++ tor/src/or/main.c	2006-07-24 05:34:30.696138870 +0200
+@@ -1483,7 +1483,7 @@
+ #ifndef MS_WINDOWS
+   if (geteuid()==0)
+     log_warn(LD_GENERAL,"You are running Tor as root. You don't need to, "
+-             "and you probably shouldn't.");
++             "and you probably shouldn't.  Maybe you are looking for the init script?  '/etc/init.d/tor start'");
+ #endif
+ 
+   crypto_global_init(get_options()->HardwareAccel);