summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--distrib/miniroot/install.sub7
1 files changed, 6 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 375fa41e92e..659ca6b4efd 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.652 2011/08/08 15:41:17 halex Exp $
+# $OpenBSD: install.sub,v 1.653 2011/10/18 19:02:44 matthieu 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
@@ -1141,6 +1141,11 @@ 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 ..."