diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-08-17 21:11:36 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-08-17 21:11:36 +0000 |
| commit | ef982a68fdc504bfa241d5a4396dc77160d367ff (patch) | |
| tree | 363f6aedff6465f7be2361dc10c1a31e65ce7309 /distrib | |
| parent | 60952983f5f5050133e8788006abc7918c93f6ed (diff) | |
With 3.4, /usr/include/ssl is a link and /usr/include/openssl is the
directory it points to. Previously ssl was the directory and openssl
the link.
That change causes the upgrade of the comp34 set to fail, so manually
adjust a pre-3.4 setup to the 3.4 setup before attempting to upgrade
any sets.
ok millert@.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 64e2233c1bf..b157e96b286 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: upgrade.sh,v 1.51 2003/08/16 20:37:24 krw Exp $ +# $OpenBSD: upgrade.sh,v 1.52 2003/08/17 21:11:35 krw Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -123,6 +123,18 @@ if ! umount /mnt; then fi mount_fs +# Prior to 3.4, /usr/include/ssl was a directory and /usr/include/openssl was a +# link to it. With 3.4, /usr/include/openssl is the directory and +# /usr/include/ssl is the link. This change causes the upgrade of comp34 to +# fail, so adjust a normal pre-3.4 setup to the new setup. +( cd /mnt/usr/include +if [[ -d ssl && -L openssl ]]; then + rm openssl + mv ssl openssl + ln -s openssl ssl +fi +) + # Install sets. install_sets |