diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-21 06:41:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-10-21 06:41:15 +0000 |
| commit | b6ed1f3af431cae77af347b3bd82617aac33a6da (patch) | |
| tree | ac487a60a45678192781a954b96e3953109cf1d0 /distrib/miniroot | |
| parent | 00b94da21cb99156c7c04c66994ab24c4a2b7118 (diff) | |
remove some backwards compat for 5.0 -> 5.1/5.2 upgrades
ok krw matthieu
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 90df8cd09b2..6576e59ea1c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.669 2012/10/20 22:40:25 halex Exp $ +# $OpenBSD: install.sub,v 1.670 2012/10/21 06:41:14 deraadt 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 @@ -1128,11 +1128,6 @@ install_files() { shacmd="cat" [[ -x /bin/sha256 ]] && shacmd="sha256 /tmp/h" - # XXX Fix xkb mistake in 5.0 - # XXX Remove this chunk after 5.2 release - local _bad_dir=/mnt/usr/X11R6/share/X11/xkb/symbols/srvr_ctrl - isin xshare${VERSION}.tgz $_get_sets && [[ -d $_bad_dir ]] && rm -rf $_bad_dir - for _f in $THESETS ; do isin $_f $_get_sets || continue echo -n "Getting $_f ..." |