d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change our default XF86Config location from /etc/ to /etc/X11/,

Browse Source 
following the lead of The XFree86 Project's default.

Approved by:	Murray
This commit is contained in:
David E. O'Brien 2002-06-10 04:47:26 +00:00
parent f7fcafe17a
commit 8777223029
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mtree/BSD.root.dist
View File

@ -20,6 +20,8 @@
..
..
etc
X11
..
defaults
..
gnats

3
usr.sbin/sade/config.c
View File

@ -709,8 +709,9 @@ tryagain:
"Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n"
"\"MouseSystems\" as the mouse protocol in the X configuration\n"
"utility.");
Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */
systemExecute(execcmd);
if (!file_readable("/etc/XF86Config")) {
if (!file_readable("/etc/X11/XF86Config")) {
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
else {

3
usr.sbin/sysinstall/config.c
View File

@ -709,8 +709,9 @@ tryagain:
"Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n"
"\"MouseSystems\" as the mouse protocol in the X configuration\n"
"utility.");
Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */
systemExecute(execcmd);
if (!file_readable("/etc/XF86Config")) {
if (!file_readable("/etc/X11/XF86Config")) {
if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?"))
goto tryagain;
else {

2
usr.sbin/sysinstall/installUpgrade.c
View File

@ -57,7 +57,7 @@ typedef struct _hitList {
/* These are the only meaningful files I know about */
static HitList etc_files [] = {
{ JUST_COPY, "Xaccel.ini", TRUE, NULL },
{ JUST_COPY, "XF86Config", TRUE, NULL },
{ JUST_COPY, "X11", TRUE, NULL },
{ JUST_COPY, "adduser.conf", TRUE, NULL },
{ JUST_COPY, "aliases", TRUE, NULL },
{ JUST_COPY, "aliases.db", TRUE, NULL },