diff options
| author | bde <bde@FreeBSD.org> | 1997-12-18 21:03:04 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-12-18 21:03:04 +0000 |
| commit | 50c5a05b16b04a3f3c0a8240c83482ddc01b028e (patch) | |
| tree | 127cbcacead203a9d4d319033474d959f2d9f2fd | |
| parent | aa2bd98249f5ba5f3de5e80de0ba8fda23d3355b (diff) | |
| download | FreeBSD-src-50c5a05b16b04a3f3c0a8240c83482ddc01b028e.zip FreeBSD-src-50c5a05b16b04a3f3c0a8240c83482ddc01b028e.tar.gz | |
Augment $PATH to ensure searching of /sbin and /usr/sbin for sysctl
instead of using an absolute path to sysctl.
Problem reported by: ache
| -rw-r--r-- | sys/conf/Makefile.i386 | 7 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 7 | ||||
| -rw-r--r-- | sys/i386/conf/Makefile.i386 | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 475b646..6292ba0 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.104 1997/11/03 21:48:31 guido Exp $ +# $Id: Makefile.i386,v 1.105 1997/11/06 03:11:30 msmith Exp $ # # Makefile for FreeBSD # @@ -201,8 +201,9 @@ install: fi chflags noschg /kernel mv /kernel /kernel.old - if [ `/usr/sbin/sysctl -n kern.bootfile` = /kernel ] ; then \ - /usr/sbin/sysctl -w kern.bootfile=/kernel.old ; \ + PATH=$${PATH}:/sbin:/usr/sbin; \ + if [ `sysctl -n kern.bootfile` = /kernel ] ; then \ + sysctl -w kern.bootfile=/kernel.old ; \ if [ -f /var/db/kvm_kernel.db ] ; then \ mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 475b646..6292ba0 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.104 1997/11/03 21:48:31 guido Exp $ +# $Id: Makefile.i386,v 1.105 1997/11/06 03:11:30 msmith Exp $ # # Makefile for FreeBSD # @@ -201,8 +201,9 @@ install: fi chflags noschg /kernel mv /kernel /kernel.old - if [ `/usr/sbin/sysctl -n kern.bootfile` = /kernel ] ; then \ - /usr/sbin/sysctl -w kern.bootfile=/kernel.old ; \ + PATH=$${PATH}:/sbin:/usr/sbin; \ + if [ `sysctl -n kern.bootfile` = /kernel ] ; then \ + sysctl -w kern.bootfile=/kernel.old ; \ if [ -f /var/db/kvm_kernel.db ] ; then \ mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 475b646..6292ba0 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.104 1997/11/03 21:48:31 guido Exp $ +# $Id: Makefile.i386,v 1.105 1997/11/06 03:11:30 msmith Exp $ # # Makefile for FreeBSD # @@ -201,8 +201,9 @@ install: fi chflags noschg /kernel mv /kernel /kernel.old - if [ `/usr/sbin/sysctl -n kern.bootfile` = /kernel ] ; then \ - /usr/sbin/sysctl -w kern.bootfile=/kernel.old ; \ + PATH=$${PATH}:/sbin:/usr/sbin; \ + if [ `sysctl -n kern.bootfile` = /kernel ] ; then \ + sysctl -w kern.bootfile=/kernel.old ; \ if [ -f /var/db/kvm_kernel.db ] ; then \ mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \ fi \ |
