diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-05-15 18:39:25 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-05-15 18:39:25 +0000 |
| commit | c769a4af5a9071e9b4216430977de853bf1555d3 (patch) | |
| tree | 66e0ca1c682891b96e5cc349e17c6cee915b2687 /sys-apps | |
| parent | Marked ~hppa until it is ready. (diff) | |
| download | gentoo-2-c769a4af5a9071e9b4216430977de853bf1555d3.tar.gz gentoo-2-c769a4af5a9071e9b4216430977de853bf1555d3.tar.bz2 gentoo-2-c769a4af5a9071e9b4216430977de853bf1555d3.zip | |
Improve detection of run-jail in initd script
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/rsbac-admin/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/rsbac-admin/files/rklogd | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-apps/rsbac-admin/ChangeLog b/sys-apps/rsbac-admin/ChangeLog index a4f59ea1af5c..ef1ef1b726db 100644 --- a/sys-apps/rsbac-admin/ChangeLog +++ b/sys-apps/rsbac-admin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/rsbac-admin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.41 2012/05/15 18:31:08 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/ChangeLog,v 1.42 2012/05/15 18:39:25 blueness Exp $ + + 15 May 2012; Anthony G. Basile <blueness@gentoo.org> files/rklogd: + Improve detection of run-jail in initd script *rsbac-admin-1.4.6-r1 (15 May 2012) diff --git a/sys-apps/rsbac-admin/files/rklogd b/sys-apps/rsbac-admin/files/rklogd index 657055eb6b74..ff8ed8291788 100644 --- a/sys-apps/rsbac-admin/files/rklogd +++ b/sys-apps/rsbac-admin/files/rklogd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/files/rklogd,v 1.1 2012/05/15 18:31:08 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rsbac-admin/files/rklogd,v 1.2 2012/05/15 18:39:25 blueness Exp $ daemon="rklogd" rsbac_info="/proc/rsbac-info" @@ -11,7 +11,7 @@ start() { local ret if [ -d "${rsbac_info}" ]; then - if [ -f $(which run-jail) ]; then + if type run-jail >/dev/null 2>&1; then $(which run-jail) $deamon start-stop-daemon --start --exec $(which ${deamon}) else start-stop-daemon --start --exec $(which ${deamon}) |