diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2002-06-10 04:47:26 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-06-10 04:47:26 +0000 |
| commit | 8777223029b066b74f73e43337fb02399d19b5bc (patch) | |
| tree | 8688cf2404c7ff6e59b6255b9f023f91206b4ca2 /usr.sbin/sysinstall | |
| parent | f7fcafe17a7a3f9d574da42f5e2f5789698dc473 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/installUpgrade.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 3d3f5bdf62ad..8878d5bc4a85 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 eccb50da0542..613ad19fdfd0 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 }, |