From c75a8ae3031abd66aba3478713ea5ecf0d7adcb6 Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 13 Dec 2004 16:45:55 +0000 Subject: [PATCH] fake: minimal-desktop: replace xfree86 by xorg contrary to xfree86, it works on sparc. livecd: adopt to xorg, change xorg.conf to something easier to edit. [2004120914113612344] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5178 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/pkgsel/minimal-desktop.in | 2 +- target/livecd/build_stage2.sh | 2 +- target/livecd/fixedfiles/XF86Config | 573 ---------------------------- target/livecd/fixedfiles/xorg.conf | 136 +++++++ target/livecd/linuxrc.c | 8 +- 5 files changed, 142 insertions(+), 579 deletions(-) delete mode 100644 target/livecd/fixedfiles/XF86Config create mode 100644 target/livecd/fixedfiles/xorg.conf diff --git a/misc/pkgsel/minimal-desktop.in b/misc/pkgsel/minimal-desktop.in index 59fa3364a..954c9b86e 100644 --- a/misc/pkgsel/minimal-desktop.in +++ b/misc/pkgsel/minimal-desktop.in @@ -113,7 +113,7 @@ pkgfilter sed ' / vim / { p; d; }; / vlock / { p; d; }; / wget / { p; d; }; -/ xfree86 / { p; d; }; +/ xorg / { p; d; }; / zip / { p; d; }; / zlib / { p; d; }; / zsh/ { p; d; }; diff --git a/target/livecd/build_stage2.sh b/target/livecd/build_stage2.sh index ee68728c7..58335d52c 100644 --- a/target/livecd/build_stage2.sh +++ b/target/livecd/build_stage2.sh @@ -31,7 +31,7 @@ cp -f $base/target/$target/fixedfiles/login-shell sbin/login-shell # this got drop once, so we ensure it's +xed. chmod 0755 sbin/login-shell cp -f $base/target/$target/fixedfiles/system etc/rc.d/init.d/system -cp -f $base/target/$target/fixedfiles/XF86Config etc/X11/XF86Config +cp -f $base/target/$target/fixedfiles/xorg.conf etc/X11/xorg.conf # echo_status "Creating 2nd_stage.img.z image... (this takes some time)... " cd .. ; mksquashfs 2nd_stage 2nd_stage.img.z -noappend > /dev/null 2>&1 diff --git a/target/livecd/fixedfiles/XF86Config b/target/livecd/fixedfiles/XF86Config deleted file mode 100644 index 024b7efc3..000000000 --- a/target/livecd/fixedfiles/XF86Config +++ /dev/null @@ -1,573 +0,0 @@ -# File generated by xf86config. -# and additional hand edited by Rene Rebe - ROCK Linux Project -# -# YOU MUST ONLY ADD A CARD SECTION AND MODIFY SOME MONITOR SETTINGS -# TO GET A WORKING X CONFIGURATION. -# - -# -# Copyright (c) 1999 by The XFree86 Project, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# Except as contained in this notice, the name of the XFree86 Project shall -# not be used in advertising or otherwise to promote the sale, use or other -# dealings in this Software without prior written authorization from the -# XFree86 Project. -# - -# ********************************************************************** -# Refer to the XF86Config(4/5) man page for details about the format of -# this file. -# ********************************************************************** - -# ********************************************************************** -# Module section -- this section is used to specify -# which dynamically loadable modules to load. -# ********************************************************************** -# -Section "Module" - - Load "dbe" # DBE (double buffer extension) - Load "ddc" # Display Data Channel extension - -# This loads the miscellaneous extensions module - SubSection "extmod" - Option "omit xfree86-dga" # don't initialise the DGA extension - Option "omit XFree86-VidModeExtension" # disable mode-switching-supoprt - EndSubSection - -# This loads the Type1 and FreeType font modules - Load "type1" - Load "freetype" - -# Load "glx" # GLX extension (OpenGL visuals) -# Load "dri" # Direct Rendering Interface extension (OpenGL) - -# Load "v4l" # Video 4 Linux extension (provides a xv adapter) -EndSection - -# this enabled normal users to use DRI - the Direct Rendering Extension. -# it is also possible to use a group to control access. -# -Section "DRI" - Mode 0666 -EndSection - -# ********************************************************************** -# Files section. This allows default font and rgb paths to be set -# ********************************************************************** - -Section "Files" - -# The location of the RGB database. Note, this is the name of the -# file minus the extension (like ".txt" or ".db"). There is normally -# no need to change the default. - - RgbPath "/usr/X11R6/lib/X11/rgb" - -# Multiple FontPath entries are allowed (which are concatenated together), -# as well as specifying multiple comma-separated entries in one FontPath -# command (or a combination of both methods) -# -# If you don't have a floating point coprocessor and emacs, Mosaic or other -# programs take long to start up, try moving the Type1 and Speedo directory -# to the end of this list (or comment them out). -# - - FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/CID/" - FontPath "/usr/X11R6/lib/X11/fonts/PEX/" - FontPath "/usr/X11R6/lib/X11/fonts/Speedo/" - FontPath "/usr/X11R6/lib/X11/fonts/Type1/" - FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/" - FontPath "/usr/X11R6/lib/X11/fonts/encodings/" - FontPath "/usr/X11R6/lib/X11/fonts/freefont/" - FontPath "/usr/X11R6/lib/X11/fonts/latin2/" - FontPath "/usr/X11R6/lib/X11/fonts/local/" - FontPath "/usr/X11R6/lib/X11/fonts/misc/" - FontPath "/usr/X11R6/lib/X11/fonts/sharefont" - FontPath "/usr/X11R6/lib/X11/fonts/TrueType" - - FontPath "/usr/share/ghostscript/fonts/" - -# The module search path. The default path is shown here. - -# ModulePath "/usr/X11R6/lib/modules" - -EndSection - -# ********************************************************************** -# Server flags section. -# ********************************************************************** - -Section "ServerFlags" - -# Uncomment this to cause a core dump at the spot where a signal is -# received. This may leave the console in an unusable state, but may -# provide a better stack trace in the core dump to aid in debugging - -# Option "NoTrapSignals" - -# Uncomment this to disable the server abort sequence -# This allows clients to receive this key event. - -# Option "DontZap" - -# Uncomment this to disable the / mode switching -# sequences. This allows clients to receive these key events. - -# Option "Dont Zoom" - -# Uncomment this to disable tuning with the xvidtune client. With -# it the client can still run and fetch card and monitor attributes, -# but it will not be allowed to change them. If it tries it will -# receive a protocol error. - -# Option "DisableVidModeExtension" - -# Uncomment this to enable the use of a non-local xvidtune client. - -# Option "AllowNonLocalXvidtune" - -# Uncomment this to disable dynamically modifying the input device -# (mouse and keyboard) settings. - -# Option "DisableModInDev" - -# Uncomment this to enable the use of a non-local client to -# change the keyboard or mouse settings (currently only xset). - -# Option "AllowNonLocalModInDev" - -EndSection - -# ********************************************************************** -# Input devices -# ********************************************************************** - -# ********************************************************************** -# Core keyboard's InputDevice section -# ********************************************************************** - -Section "InputDevice" - - Identifier "Keyboard1" - Driver "Keyboard" - -# For most OSs the protocol can be omitted (it defaults to "Standard"). -# When using XQUEUE (only for SVR3 and SVR4, but not Solaris), -# uncomment the following line. - -# Option "Protocol" "Xqueue" - - Option "AutoRepeat" "250 30" - -# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)) -# Option "Xleds" "1 2 3" - -# Option "LeftAlt" "Meta" -# Option "RightAlt" "ModeShift" - -# To customise the XKB settings to suit your keyboard, modify the -# lines below (which are the defaults). For example, for a non-U.S. -# keyboard, you will probably want to use: -# Option "XkbModel" "pc102" -# If you have a US Microsoft Natural keyboard, you can use: -# Option "XkbModel" "microsoft" -# -# Then to change the language, change the Layout setting. -# For example, a german layout can be obtained with: -# Option "XkbLayout" "de" -# or: -# Option "XkbLayout" "de" -# Option "XkbVariant" "nodeadkeys" -# -# If you'd like to switch the positions of your capslock and -# control keys, use: -# Option "XkbOptions" "ctrl:swapcaps" - -# These are the default XKB settings for XFree86 -# Option "XkbRules" "xfree86" -# Option "XkbModel" "pc101" -# Option "XkbLayout" "us" -# Option "XkbVariant" "" -# Option "XkbOptions" "" - -# Option "XkbDisable" - - Option "XkbRules" "xfree86" - Option "XkbModel" "pc105" -# Option "XkbLayout" "de" # german keyboard layout -# Option "XkbVariant" "nodeadkeys" # normally not wanted - -EndSection - - -# ********************************************************************** -# Core Pointer's InputDevice section -# ********************************************************************** - -# auto-detected mouse -Section "InputDevice" - -# Identifier and driver - - Identifier "Mouse1" - Driver "mouse" - Option "Protocol" "Auto" - Option "Device" "/dev/input/mice" - - #Option "Emulate3Buttons" "true" # for a two button touch-pad -EndSection - -# for a normal ps2 mouse: -Section "InputDevice" -# -# Identifier and driver -# - Identifier "Mouse2" - Driver "mouse" - Option "Protocol" "Auto" - Option "Device" "/dev/misc/psaux" - -# #Option "Emulate3Buttons" "true" # for a two button touch-pad -EndSection - -# for a normal serial mouse -#Section "InputDevice" -# -# Identifier "Mouse1" -# Driver "mouse" -# Option "Protocol" "Microsoft" -# Option "Device" "/dev/tts/0" -# -# #Option "Emulate3Buttons" "true" # for a two button touch-pad -#EndSection - -# for a usb Logitech wheel mouse -#Section "InputDevice" -# -# Identifier "Mouse1" -# Driver "mouse" -# Option "Protocol" "IMPS/2" -# Option "Device" "/dev/input/mouse0" -# Option "Buttons" "5" -# Option "ZaxisMapping" "4 5" -# -#EndSection - - -# ********************************************************************** -# Other input device sections -# this is optional and is required only if you -# are using extended input devices. This is for example only. Refer -# to the XF86Config man page for a description of the options. -# ********************************************************************** -# -# Section "InputDevice" -# Identifier "Mouse2" -# Driver "mouse" -# Option "Protocol" "MouseMan" -# Option "Device" "/dev/mouse2" -# EndSection -# -# Section "InputDevice" -# Identifier "Spaceball" -# Driver "magellan" -# Option "Device" "/dev/cua0" -# EndSection -# -# Section "InputDevice" -# Identifier "Spaceball2" -# Driver "spaceorb" -# Option "Device" "/dev/cua0" -# EndSection -# -# Section "InputDevice" -# Identifier "Touchscreen0" -# Driver "microtouch" -# Option "Device" "/dev/ttyS0" -# Option "MinX" "1412" -# Option "MaxX" "15184" -# Option "MinY" "15372" -# Option "MaxY" "1230" -# Option "ScreenNumber" "0" -# Option "ReportingMode" "Scaled" -# Option "ButtonNumber" "1" -# Option "SendCoreEvents" -# EndSection -# -# Section "InputDevice" -# Identifier "Touchscreen1" -# Driver "elo2300" -# Option "Device" "/dev/ttyS0" -# Option "MinX" "231" -# Option "MaxX" "3868" -# Option "MinY" "3858" -# Option "MaxY" "272" -# Option "ScreenNumber" "0" -# Option "ReportingMode" "Scaled" -# Option "ButtonThreshold" "17" -# Option "ButtonNumber" "1" -# Option "SendCoreEvents" -# EndSection - -# Section "InputDevice" -# Identifier "Tablet1" -# Driver "summa" -# Option "Device" "/dev/ttyS0" -# Option "MinX" "231" -# Option "MaxX" "3868" -# Option "MinY" "3858" -# Option "MaxY" "272" -# Option "ScreenNumber" "0" -# Option "ReportingMode" "Scaled" -# Option "ButtonThreshold" "17" -# Option "ButtonNumber" "1" -# Option "SendCoreEvents" -# Option "BaudRate" "19200" -# Option "DataBits" "8" -# Option "StopBits" "1" -# Option "Parity" "Odd" -# Option "FlowControl" "Xoff" -# Option "VTime" "10" -# Option "VMin" "1" -# EndSection - - -# ********************************************************************** -# Monitor section -# ********************************************************************** - -# Any number of monitor sections may be present - -Section "Monitor" - - Identifier "Monitor1" - -# NOTE: THE VALUES HERE ARE EXAMPLES ONLY. REFER TO YOUR MONITOR'S -# USER MANUAL FOR THE CORRECT NUMBERS !! - -# normally uncomment this lines -# HorizSync 24.0 - 80.0 -# VertRefresh 50-100 - -# overwrite the screen dimensions (in mm) e.g. to get another virtual dpi -# value -# DisplaySize 345 260 - -# HorizSync is in kHz unless units are specified. -# HorizSync may be a comma separated list of discrete values, or a -# comma separated list of ranges of values. -# HorizSync 30-64 # multisync -# HorizSync 31.5, 35.2 # multiple fixed sync frequencies -# HorizSync 15-25, 30-50 # multiple ranges of sync frequencies - -# VertRefresh is in Hz unless units are specified. -# VertRefresh may be a comma separated list of discrete values, or a -# comma separated list of ranges of values. -# VertRefresh 50-100 - -# some mode examples 1,2 selfmade - 3 from fbset -# (only needed for low-level tricks, exotic Laptops or other LCD's) -# -# Mode "1152x900" -# DotClock 120 -# HTimings 1152 1200 1312 1528 -# VTimings 900 910 946 985 -# EndMode -# Mode "1152x900-2" -# DotClock 100 -# HTimings 1152 1200 1312 1528 -# VTimings 900 910 946 985 -# EndMode -# Mode "1152x864" -# DotClock 105.810 -# HTimings 1152 1184 1312 1504 -# VTimings 864 868 872 902 -# Flags "-HSync" "-VSync" -# EndMode - -# for framebuffer devices you might want to simply add -# the 'fbset -x' output here. - -EndSection - - -# ********************************************************************** -# Graphics device section -# ********************************************************************** - -# Any number of graphics device sections may be present - -Section "Device" - Identifier "Card1" - - # Use this for framebuffer devices - should work on most systems. - Driver "fbdev" - Option "fbdev" "/dev/fb/0" - -# Driver "vga" # mga, ati, nv, sis, vesa ... -# # Option "BackingStore" - -# # Some driver accept an UseFBDev option (e.g. radeon) to switch the -# # mode via the Linux framebuffer layer. Needed e.g. as workaround for -# # iBooks. -# # Option "UseFBDev" - -# # The BuID is only required for multi-monitor configs or some fbdev drivers -# # BusID "PCI:1:5:0" -# # Screen 0 # Screen of a dual-head mga card - -# # Option "NoHal" # do not use the binary-only Matrox HAL library -# # Option "AGPMode2x" - -EndSection - -# Matrox Millenium 4xx, Ati or NVidia second-head -#Section "Device" -# Identifier "Card2" -# Driver "mga" # or other dual-able cards like ati, nv -# # Option "BackingStore" - -# BusID "PCI:1:5:0" -# Screen 1 -# -# # Option "NoHal" # do not use the binary-only Matrox HAL library -# # Option "AGPMode2x" - -# # Option "Tv" "yes" -# # Option "TVStandard" "PAL" -# # Option "CableType" "SCART_COMPOSITE" -#EndSection - -# ********************************************************************** -# Screen sections -# ********************************************************************** - -# Any number of screen sections may be present. Each describes -# the configuration of a single screen. A single specific screen section -# may be specified from the X server command line with the "-screen" -# option. -Section "Screen" - Identifier "Screen1" - Device "Card1" - Monitor "Monitor1" - DefaultDepth 16 - - Subsection "Display" - Depth 4 - Modes "1024x768" "800x600" "640x480" - ViewPort 0 0 - EndSubsection - Subsection "Display" - Depth 8 - Modes "1024x768" "800x600" "640x400" - ViewPort 0 0 - EndSubsection - Subsection "Display" - Depth 16 - Modes "1024x768" "800x600" "640x480" - ViewPort 0 0 - EndSubsection - Subsection "Display" - Depth 24 - Modes "1024x768" "800x600" "640x480" - ViewPort 0 0 - EndSubsection - Subsection "Display" - Depth 32 - Modes "1024x768" "800x600" "640x480" - ViewPort 0 0 - EndSubsection -EndSection - -#Section "Screen" -# Identifier "Screen2" -# Device "Card2" -# Monitor "Monitor1" -# DefaultDepth 16 -# -# Subsection "Display" -# Depth 16 -# Modes "1024x768" "800x600" "640x480" -# ViewPort 0 0 -# EndSubsection -#EndSection - -#Section "Screen" -# Identifier "ScreenTV" -# Device "CardTV" -# Monitor "Monitor1" -# DefaultDepth 16 -# -# Subsection "Display" -# Depth 16 -# Modes "640x480" -# ViewPort 0 0 -# EndSubsection -#EndSection - - -# ********************************************************************** -# ServerLayout sections. -# ********************************************************************** - -# Any number of ServerLayout sections may be present. Each describes -# the way multiple screens are organised. A specific ServerLayout -# section may be specified from the X server command line with the -# "-layout" option. In the absence of this, the first section is used. -# When now ServerLayout section is present, the first Screen section -# is used alone. - -Section "ServerLayout" - -# The Identifier line must be present - Identifier "Simple Layout" - -# Each Screen line specifies a Screen section name, and optionally -# the relative position of other screens. The four names after -# primary screen name are the screens to the top, bottom, left and right -# of the primary screen. In this example, screen 2 is located to the -# right of screen 1. - - Screen "Screen1" #LeftOf "Screen2" - #Screen "Screen2" - #Screen "ScreenTV" - -# Each InputDevice line specifies an InputDevice section name and -# optionally some options to specify the way the device is to be -# used. Those options include "CorePointer", "CoreKeyboard" and -# "SendCoreEvents". - - InputDevice "Mouse1" "CorePointer" - InputDevice "Mouse2" "SendCoreEvents" - InputDevice "Keyboard1" "CoreKeyboard" - -# It is possible to specify secondary input devices which might not -# be pressend on X startup. Nice for laptops with temporary external -# mices ;-)! - -# InputDevice "Mouse2" "SendCoreEvents" -# InputDevice "Tablet1" - -EndSection - diff --git a/target/livecd/fixedfiles/xorg.conf b/target/livecd/fixedfiles/xorg.conf new file mode 100644 index 000000000..5dc17a5b5 --- /dev/null +++ b/target/livecd/fixedfiles/xorg.conf @@ -0,0 +1,136 @@ +Section "Monitor" + Identifier "Monitor1" +# NOTE: THE VALUES HERE ARE EXAMPLES ONLY. REFER TO YOUR MONITOR'S +# USER MANUAL FOR THE CORRECT NUMBERS !! +# normally uncomment this lines +# HorizSync 24.0 - 80.0 +# VertRefresh 50-100 +EndSection + +Section "Device" + Identifier "Card1" + # Use this for framebuffer devices - should work on most systems. + Driver "fbdev" + Option "fbdev" "/dev/fb/0" + # Some driver accept an UseFBDev option (e.g. radeon) to switch the + # mode via the Linux framebuffer layer. Needed e.g. as workaround for + # iBooks. + # Option "UseFBDev" +EndSection + +Section "Screen" + Identifier "Screen1" + Device "Card1" + Monitor "Monitor1" + DefaultDepth 16 + + Subsection "Display" + Depth 4 + Modes "1024x768" "800x600" "640x480" + ViewPort 0 0 + EndSubsection + Subsection "Display" + Depth 8 + Modes "1024x768" "800x600" "640x400" + ViewPort 0 0 + EndSubsection + Subsection "Display" + Depth 16 + Modes "1024x768" "800x600" "640x480" + ViewPort 0 0 + EndSubsection + Subsection "Display" + Depth 24 + Modes "1024x768" "800x600" "640x480" + ViewPort 0 0 + EndSubsection + Subsection "Display" + Depth 32 + Modes "1024x768" "800x600" "640x480" + ViewPort 0 0 + EndSubsection +EndSection + +Section "Module" + + Load "dbe" # DBE (double buffer extension) + Load "ddc" # Display Data Channel extension + +# This loads the miscellaneous extensions module + SubSection "extmod" + Option "omit xfree86-dga" # don't initialise the DGA extension + Option "omit XFree86-VidModeExtension" # disable mode-switching-supoprt + EndSubSection + +# This loads the Type1 and FreeType font modules + Load "type1" + Load "freetype" + +# Load "glx" # GLX extension (OpenGL visuals) +# Load "dri" # Direct Rendering Interface extension (OpenGL) + +# Load "v4l" # Video 4 Linux extension (provides a xv adapter) +EndSection + +# this enabled normal users to use DRI - the Direct Rendering Extension. +# it is also possible to use a group to control access. +# +Section "DRI" + Mode 0666 +EndSection + +Section "Files" + RgbPath "/usr/X11R6/lib/X11/rgb" + FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" + FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" + FontPath "/usr/X11R6/lib/X11/fonts/CID/" + FontPath "/usr/X11R6/lib/X11/fonts/PEX/" + FontPath "/usr/X11R6/lib/X11/fonts/Speedo/" + FontPath "/usr/X11R6/lib/X11/fonts/Type1/" + FontPath "/usr/X11R6/lib/X11/fonts/cyrillic/" + FontPath "/usr/X11R6/lib/X11/fonts/encodings/" + FontPath "/usr/X11R6/lib/X11/fonts/freefont/" + FontPath "/usr/X11R6/lib/X11/fonts/latin2/" + FontPath "/usr/X11R6/lib/X11/fonts/local/" + FontPath "/usr/X11R6/lib/X11/fonts/misc/" + FontPath "/usr/X11R6/lib/X11/fonts/sharefont" + FontPath "/usr/X11R6/lib/X11/fonts/TrueType" + FontPath "/usr/share/ghostscript/fonts/" +EndSection + +Section "ServerFlags" +EndSection + +Section "InputDevice" + + Identifier "Keyboard1" + Driver "keyboard" + Option "AutoRepeat" "250 30" + Option "XkbRules" "xfree86" + Option "XkbModel" "pc105" +EndSection + + +Section "InputDevice" + Identifier "Mouse1" + Driver "mouse" + Option "Protocol" "Auto" + Option "Device" "/dev/input/mice" + #Option "Emulate3Buttons" "true" # for a two button touch-pad +EndSection + +Section "InputDevice" + Identifier "Mouse2" + Driver "mouse" + Option "Protocol" "Auto" + Option "Device" "/dev/misc/psaux" +EndSection + +Section "ServerLayout" + Identifier "Simple Layout" + Screen "Screen1" + InputDevice "Mouse1" "CorePointer" + InputDevice "Mouse2" "SendCoreEvents" + InputDevice "Keyboard1" "CoreKeyboard" +EndSection + diff --git a/target/livecd/linuxrc.c b/target/livecd/linuxrc.c index 295ac4c53..a33839674 100644 --- a/target/livecd/linuxrc.c +++ b/target/livecd/linuxrc.c @@ -426,10 +426,10 @@ int prepare_root() { if(!fnd) fputs("sound:x:17:rocker\n",mod); fclose(orig); fclose(mod); buf[1]=0; - /* copy over XF86Config */ - DEBUG("modifying /etc/X11/XF86Config"); - orig = fopen("/ROCK/etc/X11/XF86Config","r"); - mod = fopen("/etc/X11/XF86Config","w"); + /* copy over xorg.conf */ + DEBUG("modifying /etc/X11/xorg.conf"); + orig = fopen("/ROCK/etc/X11/xorg.conf","r"); + mod = fopen("/etc/X11/xorg.conf","w"); while(fgets(buf, 256, orig) != NULL) fputs(buf, mod); fclose(orig); fclose(mod); buf[1]=0;