diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-10-04 20:14:21 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-10-04 20:14:21 +0000 |
| commit | d76e29d37e46eb7f850b6fe6096e0659d63a1b7b (patch) | |
| tree | 3383862083c2000a1de86939f6748b9903517a8e /net-proxy | |
| parent | Add alternative download URL per upstream announcement. (diff) | |
| download | gentoo-2-d76e29d37e46eb7f850b6fe6096e0659d63a1b7b.tar.gz gentoo-2-d76e29d37e46eb7f850b6fe6096e0659d63a1b7b.tar.bz2 gentoo-2-d76e29d37e46eb7f850b6fe6096e0659d63a1b7b.zip | |
lsof shows files like /.sock{dshmem,slock}XXXXXXX being created by sockd, and failing when / is read-only. Force them to be created in /var/lock instead.
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/dante/ChangeLog | 6 | ||||
| -rw-r--r-- | net-proxy/dante/files/dante-sockd-init | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog index 00c53731c891..3d8fae920b96 100644 --- a/net-proxy/dante/ChangeLog +++ b/net-proxy/dante/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/dante # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.59 2011/08/04 16:33:12 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.60 2011/10/04 20:14:21 robbat2 Exp $ + + 04 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> files/dante-sockd-init: + lsof shows files like /.sock{dshmem,slock}XXXXXXX being created by sockd, and + failing when / is read-only. Force them to be created in /var/lock instead. *dante-1.3.2 (04 Aug 2011) diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init index 66d02bd6fb2c..5147044c6910 100644 --- a/net-proxy/dante/files/dante-sockd-init +++ b/net-proxy/dante/files/dante-sockd-init @@ -1,13 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.6 2009/03/05 19:31:13 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.7 2011/10/04 20:14:21 robbat2 Exp $ SOCKD_OPT="-D" [ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}" [ "${SOCKD_DEBUG:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d" [ "${SOCKD_DISABLE_KEEPALIVE:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n" PIDFILE=/var/run/sockd.pid +SOCKDIR=/var/lock/dante-sockd/ depend() { need net @@ -35,6 +36,8 @@ checkconfig() { DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf` if [ -n "$DAEMON_UID" ]; then touch $PIDFILE && chown $DAEMON_UID $PIDFILE + mkdir $SOCKDIR && chown $DAEMON_UID $SOCKDIR + [ ! -f $SOCKDIR/.keep ] && touch $SOCKDIR/.keep fi return 0 @@ -43,7 +46,7 @@ checkconfig() { start() { checkconfig || return 1 ebegin "Starting dante sockd" - start-stop-daemon --start --quiet --pidfile $PIDFILE \ + start-stop-daemon --start --quiet --pidfile $PIDFILE --env TMPDIR=$SOCKDIR \ --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} >/dev/null 2>&1 eend $? "Failed to start sockd" } |