Module Name: src
Committed By: snj
Date: Thu Oct 8 06:41:44 UTC 2009
Modified Files:
src/distrib/utils/sysinst: util.c
Log Message:
/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, otherwise
we end up in a puddle of suck.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 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.159 src/distrib/utils/sysinst/util.c:1.160
--- src/distrib/utils/sysinst/util.c:1.159 Mon Sep 7 02:31:53 2009
+++ src/distrib/utils/sysinst/util.c Thu Oct 8 06:41:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.159 2009/09/07 02:31:53 jnemeth Exp $ */
+/* $NetBSD: util.c,v 1.160 2009/10/08 06:41:43 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -668,6 +668,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 "./". */
rval = run_program(RUN_DISPLAY | RUN_PROGRESS,
"progress -zf %s tar --chroot -xhepf -", path);
