diff options
| author | jkh <jkh@FreeBSD.org> | 1998-09-29 14:23:13 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-09-29 14:23:13 +0000 |
| commit | 72ea6df735de717d67bef2713a5449b13ac751a6 (patch) | |
| tree | 10e22de61ae4da46d42dd4a870d6b2061c65cac3 /release | |
| parent | 0332bc6517ed70abbf608508f724f7c3f1c5f641 (diff) | |
| download | FreeBSD-src-72ea6df735de717d67bef2713a5449b13ac751a6.zip FreeBSD-src-72ea6df735de717d67bef2713a5449b13ac751a6.tar.gz | |
Add in a kludge for registering the "package" version of XFree86 so
various ports don't complain about it. It also requires that the pkg
registration bits be stick into the Xbin tarball so that they'll be
present in /usr/X11R6/lib/X11/pkgreg.tar.gz. The registration tarball
is removed upon first use to prevent it later spamming a genuine build
from ports if inadvertently extracted again.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/install.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 294df02..aaee155 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.210 1998/08/31 17:47:52 jkh Exp $ + * $Id: install.c,v 1.211 1998/09/29 05:12:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -794,14 +794,19 @@ installFixup(dialogMenuItem *self) } } } - /* XXX Do all the last ugly work-arounds here which we'll try and excise someday right?? XXX */ + /* Do all the last ugly work-arounds here */ msgNotify("Fixing permissions.."); - /* BOGON #1: XFree86 extracting /usr/X11R6 with root-only perms */ + /* BOGON #1: XFree86 requires various specialized fixups */ if (directory_exists("/usr/X11R6")) { vsystem("chmod -R a+r /usr/X11R6"); vsystem("find /usr/X11R6 -type d | xargs chmod a+x"); + + /* Also do bogus minimal package registration so ports don't whine */ + if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) + vsystem("tar xpzf -C / /usr/X11R6/lib/X11/pkgreg.tar.gz && rm /usr/X11R6/lib/X11/pkgreg.tar.gz"); } + /* BOGON #2: We leave /etc in a bad state */ chmod("/etc", 0755); |
