diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2010-06-30 00:23:03 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2010-06-30 00:23:03 +0000 |
| commit | cfea1485ecb8abe2f1a6ba01c2df447aaa6c85dc (patch) | |
| tree | 85573c8d759e165cb8c67dc824557f7e338e1be7 /distrib/miniroot/install.sub | |
| parent | 54af45f51de9c7acbbfde386e3ede0344034da9f (diff) | |
handle whitespace around installpath in pkg.conf
feedback from espie@ deraadt@ krw@
ok krw@
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 278b8b63a19..405237084cd 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.606 2010/06/29 15:11:45 halex Exp $ +# $OpenBSD: install.sub,v 1.607 2010/06/30 00:23:02 halex Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1836,8 +1836,8 @@ finish_up() { # Create or update pkg.conf with the new package path, if any if [[ -n $package_path ]]; then - grep -v '^installpath=' /mnt/etc/pkg.conf 2>&- > /tmp/pkgconf - print -r -- "installpath=$package_path" >> /tmp/pkgconf + grep -v '^[ ]*installpath[ ]*=' /mnt/etc/pkg.conf 2>&- > /tmp/pkgconf + print -r -- "installpath = $package_path" >> /tmp/pkgconf cp /tmp/pkgconf /mnt/etc/pkg.conf fi |