diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-09-09 08:28:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-09 08:28:05 +0000 |
| commit | d197ddcb41e3a8eb8e6971469b04eb1aa845133f (patch) | |
| tree | 5e44da57d41a7568ae40b1148e29edb7a28cd533 | |
| parent | Add some dodoc to dosemu (diff) | |
| download | gentoo-2-d197ddcb41e3a8eb8e6971469b04eb1aa845133f.tar.gz gentoo-2-d197ddcb41e3a8eb8e6971469b04eb1aa845133f.tar.bz2 gentoo-2-d197ddcb41e3a8eb8e6971469b04eb1aa845133f.zip | |
Dont use a tempfile in init.d restart() #146624 by Stefan Hellermann.
(Portage version: 2.1.1_rc1-r6)
| -rw-r--r-- | net-nds/portmap/ChangeLog | 7 | ||||
| -rw-r--r-- | net-nds/portmap/files/digest-portmap-5b-r9 | 2 | ||||
| -rw-r--r-- | net-nds/portmap/files/portmap.rc6 | 14 |
3 files changed, 13 insertions, 10 deletions
diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog index cb5b78d019ec..4e38ead3f98f 100644 --- a/net-nds/portmap/ChangeLog +++ b/net-nds/portmap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/portmap -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.32 2005/08/23 13:21:37 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.33 2006/09/09 08:28:05 vapier Exp $ + + 09 Sep 2006; Mike Frysinger <vapier@gentoo.org> files/portmap.rc6: + Dont use a tempfile in init.d restart() #146624 by Stefan Hellermann. 23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> portmap-5b-r9.ebuild: Use -1 instead of /bin/false on enewuser call. diff --git a/net-nds/portmap/files/digest-portmap-5b-r9 b/net-nds/portmap/files/digest-portmap-5b-r9 index 61f9e105bbe8..3ef118a79c29 100644 --- a/net-nds/portmap/files/digest-portmap-5b-r9 +++ b/net-nds/portmap/files/digest-portmap-5b-r9 @@ -1 +1,3 @@ MD5 781e16ed4487c4caa082c6fef09ead4f portmap_5beta.tar.gz 18702 +RMD160 eb789f3d61f5bccefa09275bca70b0947bc2f365 portmap_5beta.tar.gz 18702 +SHA256 e8fb4429ecf03809f60b2e194be120a811be1c5cc3cc5d933ede938114357b61 portmap_5beta.tar.gz 18702 diff --git a/net-nds/portmap/files/portmap.rc6 b/net-nds/portmap/files/portmap.rc6 index b167c97a4c1b..80abe5c72d80 100644 --- a/net-nds/portmap/files/portmap.rc6 +++ b/net-nds/portmap/files/portmap.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.10 2005/03/03 23:24:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/files/portmap.rc6,v 1.11 2006/09/09 08:28:05 vapier Exp $ depend() { use net @@ -29,9 +29,8 @@ stop() { restart() { # Dump the portmapper's table before stopping ebegin "Saving portmap table" - local tmpfile=`mktemp /tmp/pmap_table.XXXXXX` - [ -n "$tmpfile" ] && pmap_dump >$tmpfile - eend $? "Error saving portmap table." + local pmap=$(pmap_dump) + eend $? # Stop and restart portmapper svc_stop @@ -39,10 +38,9 @@ restart() { svc_start # Reload the portmapper's table - if [ -n "$tmpfile" ]; then + if [[ -n ${pmap} ]] ; then ebegin "Reloading portmap table" - pmap_set <$tmpfile - eend $? "Error reloading portmap table." - rm -f $tmpfile + echo "${pmap}" | pmap_set + eend $? fi } |