From 5d096a1b5cd4220c39f0c410ac8c2ffa0ca4534c Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 10 Jun 2002 04:47:26 +0000 Subject: Change our default XF86Config location from /etc/ to /etc/X11/, following the lead of The XFree86 Project's default. Approved by: Murray --- usr.sbin/sade/config.c | 3 ++- usr.sbin/sysinstall/config.c | 3 ++- usr.sbin/sysinstall/installUpgrade.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 3d3f5bd..8878d5b 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -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 { diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 3d3f5bd..8878d5b 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -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 { diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c index eccb50da..613ad19 100644 --- a/usr.sbin/sysinstall/installUpgrade.c +++ b/usr.sbin/sysinstall/installUpgrade.c @@ -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 }, -- cgit v1.1