Module Name: src Committed By: sborrill Date: Fri Oct 9 08:09:24 UTC 2009
Modified Files: src/distrib/utils/sysinst [netbsd-5]: util.c Log Message: Pull up the following revisions(s) (requested by snj in ticket #1081): distrib/utils/sysinst/util.c: revision 1.160 /usr/X11R7/lib/X11/xkb/symbols/pc went from a directory to a file, so on upgrades we need to remove it before extracting the xbase set. To generate a diff of this commit: cvs rdiff -u -r1.151.14.2 -r1.151.14.3 src/distrib/utils/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/utils/sysinst/util.c diff -u src/distrib/utils/sysinst/util.c:1.151.14.2 src/distrib/utils/sysinst/util.c:1.151.14.3 --- src/distrib/utils/sysinst/util.c:1.151.14.2 Wed Feb 18 01:17:23 2009 +++ src/distrib/utils/sysinst/util.c Fri Oct 9 08:09:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.151.14.2 2009/02/18 01:17:23 snj Exp $ */ +/* $NetBSD: util.c,v 1.151.14.3 2009/10/09 08:09:24 sborrill Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -675,6 +675,14 @@ } else target_chdir_or_die("/"); + /* + * /usr/X11R7/lib/X11/xkb/symbols/pc was a directory in 5.0 + * but is a file in 5.1 and beyond, so on upgrades we need to + * delete it before extracting the xbase set. + */ + if (update && dist->set == SET_X11_BASE) + run_program(0, "rm -rf usr/X11R7/lib/X11/xkb/symbols/pc"); + /* now extract set files into "./". */ if (verbose == 0) rval = run_program(RUN_DISPLAY | RUN_PROGRESS,