diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2013-01-02 14:00:42 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2013-01-02 14:00:42 +0000 |
| commit | 5f7e6454ab96c8e311cc97b7c7811a27c0033313 (patch) | |
| tree | cd513c4518e284c47a973f30bd6858b055b69e23 /ports-mgmt/pkg_jail/files | |
| parent | 384a5e30c1181f6f04de5e66d33c6bd406cd3756 (diff) | |
| download | ports-5f7e6454ab96c8e311cc97b7c7811a27c0033313.tar.gz ports-5f7e6454ab96c8e311cc97b7c7811a27c0033313.zip | |
Notes
Diffstat (limited to 'ports-mgmt/pkg_jail/files')
| -rw-r--r-- | ports-mgmt/pkg_jail/files/pkg_jail | 11 | ||||
| -rw-r--r-- | ports-mgmt/pkg_jail/files/pkg_update | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/ports-mgmt/pkg_jail/files/pkg_jail b/ports-mgmt/pkg_jail/files/pkg_jail index e5595aa0960b..0b8681f3b604 100644 --- a/ports-mgmt/pkg_jail/files/pkg_jail +++ b/ports-mgmt/pkg_jail/files/pkg_jail @@ -125,22 +125,17 @@ pkg_jail_create_devfs() then pkg_jail_create_dev_links ${jail_devdir} null console fi - if test ! -L "${jail_devdir}/mem" + if test ! -e "${jail_devdir}/mem" then # for libkvm (ab)users pkg_jail_create_dev_links ${jail_devdir} null mem pkg_jail_create_dev_links ${jail_devdir} null kmem fi - if test ! -L ${jail_devdir}/log + if test ! -e ${jail_devdir}/log then # Transitional symlink for old binaries pkg_jail_create_dev_links ${jail_devdir} ../var/run/log log fi - if test ! -L "${pkg_jail_dir}/var/log/console" - then - # Jail console output - pkg_jail_create_dev_links ${jail_devdir} ../var/log/console console - fi } pkg_jail_create_jail_mount() { @@ -221,7 +216,7 @@ pkg_jail_init() pkg_jail_create_devfs pkg_jail_create_jail_mount "${pkg_jail_dir}" /usr/sbin/jail -n "${pkg_jail_short}" "${pkg_jail_dir}" "${pkg_jail_hostname}" "${pkg_jail_ip}" \ - /bin/sh -c "/usr/ports/ports-mgmt/pkg_jail && make install-ports" + /bin/sh -c "cd /usr/ports/ports-mgmt/pkg_jail && make install-ports" pkg_jail_umount fi } diff --git a/ports-mgmt/pkg_jail/files/pkg_update b/ports-mgmt/pkg_jail/files/pkg_update index 4a56c8f050d7..2798196cf877 100644 --- a/ports-mgmt/pkg_jail/files/pkg_update +++ b/ports-mgmt/pkg_jail/files/pkg_update @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: pkg_update,v 1.70 2012/01/15 10:55:12 cvs Exp $ -# $FreeBSD$ +# $Id: pkg_update,v 1.72 2013/01/02 13:46:24 cvs Exp $ +# $FreeBSD$ # # Copyright (c) 2001-2006 # by Dirk Meyer, All rights reserved. @@ -2220,7 +2220,7 @@ check-installed-ports) pkgname=`cd "${portsdir}/${origin}" && make -V PKGNAME 2>/dev/null` if test -e "${pkg_dbdir}/${pkgname}/+CONTENTS" then - if test -e "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" + if test -s "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" then echo "${origin} (dependency)" continue @@ -2229,7 +2229,7 @@ check-installed-ports) continue fi pkgname=`pkg_info -qO ${origin}` - if test -e "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" + if test -s "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" then echo "${origin} (old version, dependency)" continue |