artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c21a88b
)
Leave PATH alone.
author
ajacoutot
<ajacoutot@openbsd.org>
Mon, 21 Jul 2008 08:28:55 +0000
(08:28 +0000)
committer
ajacoutot
<ajacoutot@openbsd.org>
Mon, 21 Jul 2008 08:28:55 +0000
(08:28 +0000)
noticed by and ok deraadt@
usr.sbin/sysmerge/sysmerge.sh
patch
|
blob
|
history
diff --git
a/usr.sbin/sysmerge/sysmerge.sh
b/usr.sbin/sysmerge/sysmerge.sh
index
db2b18a
..
b04bd33
100644
(file)
--- a/
usr.sbin/sysmerge/sysmerge.sh
+++ b/
usr.sbin/sysmerge/sysmerge.sh
@@
-1,6
+1,6
@@
#!/bin/sh -
#
-# $OpenBSD: sysmerge.sh,v 1.1
8 2008/07/10 16:49:26
ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.1
9 2008/07/21 08:28:55
ajacoutot Exp $
#
# This script is based on the FreeBSD mergemaster script, written by
# Douglas Barton <DougB@FreeBSD.org>
@@
-25,7
+25,6
@@
#
umask 0022
-PATH="/bin:/usr/bin:/sbin:/usr/sbin"
PAGER="${PAGER:=/usr/bin/more}"
SWIDTH=`stty size | awk '{w=$2} END {if (w==0) {w=80} print w}'`