Change our default XF86Config location from /etc/ to /etc/X11/,
following the lead of The XFree86 Project's default. Approved by: Murray
This commit is contained in:
parent
f7fcafe17a
commit
8777223029
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=98079
@ -20,6 +20,8 @@
|
||||
..
|
||||
..
|
||||
etc
|
||||
X11
|
||||
..
|
||||
defaults
|
||||
..
|
||||
gnats
|
||||
|
@ -709,8 +709,9 @@ configXSetup(dialogMenuItem *self)
|
||||
"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 {
|
||||
|
@ -709,8 +709,9 @@ configXSetup(dialogMenuItem *self)
|
||||
"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 {
|
||||
|
@ -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 },
|
||||
|
Loading…
Reference in New Issue
Block a user