[or-cvs] Tell users about the init script when they try to run Tor a...

[Peter Palfrader]

Update of /home/or/cvsroot/tor/debian/patches
In directory moria:/tmp/cvs-serv23398/debian/patches

Modified Files:
	00list 
Added Files:
	11_tor_as_root_more_helpful.dpatch 
Log Message:
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


Index: 00list
===================================================================
RCS file: /home/or/cvsroot/tor/debian/patches/00list,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- 00list	12 Oct 2005 18:40:05 -0000	1.11
+++ 00list	24 Jul 2006 03:38:26 -0000	1.12
@@ -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

--- NEW FILE: 11_tor_as_root_more_helpful.dpatch ---
#! /bin/sh -e
## 08_no_run_as_root.dpatch by  <weasel at 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);