diff options
| -rw-r--r-- | xserver/hw/xfree86/common/xf86Init.c | 12 | ||||
| -rw-r--r-- | xserver/hw/xfree86/man/Xorg.man | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/xserver/hw/xfree86/common/xf86Init.c b/xserver/hw/xfree86/common/xf86Init.c index a05e3f713..4a40b185f 100644 --- a/xserver/hw/xfree86/common/xf86Init.c +++ b/xserver/hw/xfree86/common/xf86Init.c @@ -1436,18 +1436,6 @@ ddxProcessArgument(int argc, char **argv, int i) return 1; } #endif - if (!strcmp(argv[i], "-configure")) { - if (getuid() != 0 && geteuid() == 0) { - ErrorF("The '-configure' option can only be used by root.\n"); - exit(1); - } - xf86DoConfigure = TRUE; - xf86AllowMouseOpenFail = TRUE; -#ifdef X_PRIVSEP - xf86KeepPriv = TRUE; -#endif - return 1; - } #ifdef X_PRIVSEP if (!strcmp(argv[i], "-keepPriv")) { if (getuid() != 0) { diff --git a/xserver/hw/xfree86/man/Xorg.man b/xserver/hw/xfree86/man/Xorg.man index 7780c2a95..08fb3651e 100644 --- a/xserver/hw/xfree86/man/Xorg.man +++ b/xserver/hw/xfree86/man/Xorg.man @@ -185,16 +185,6 @@ This option will work for any directory when the server is run as root (i.e, with real-uid 0), or for directories relative to a directory in the config directory search path for all other users. .TP 8 -.B \-configure -When this option is specified, the -.B Xorg -server loads all video driver modules, probes for available hardware, -and writes out an initial xorg.conf(__filemansuffix__) file based on -what was detected. This option currently has some problems on some -platforms, but in most cases it is a good way to bootstrap the -configuration process. This option is only available when the server -is run as root (i.e, with real-uid 0). -.TP 8 .BI "\-crt /dev/tty" XX SCO only. This is the same as the .B vt |