diff options
author | Andrew Gaffney <agaffney@gentoo.org> | 2009-12-26 18:18:52 -0600 |
---|---|---|
committer | Andrew Gaffney <agaffney@gentoo.org> | 2009-12-26 18:18:52 -0600 |
commit | a4802c4c6be7068ec7778c8b812a069bacbbd99f (patch) | |
tree | a6f556232d14c2ec1566c6ded88c7a1d12aaccd7 | |
parent | Use /etc/.noxdm intead of /etc/init.d/.noxdm for Gentoo bug #286308 (diff) | |
download | livecd-tools-a4802c4c6be7068ec7778c8b812a069bacbbd99f.tar.gz livecd-tools-a4802c4c6be7068ec7778c8b812a069bacbbd99f.tar.bz2 livecd-tools-a4802c4c6be7068ec7778c8b812a069bacbbd99f.zip |
Remove x-setup and mkxf86config stuff since they're not needed with modern xorg-server (for Gentoo bug #289946)
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | autoconfig | 13 | ||||
-rwxr-xr-x | x-setup | 49 | ||||
-rwxr-xr-x | x-setup.init | 12 |
4 files changed, 6 insertions, 73 deletions
@@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 27 Dec 2009; Andrew Gaffney <agaffney@gentoo.org> autoconfig, -x-setup, + -x-setup.init: + Remove x-setup and mkxf86config stuff since they're not needed with modern + xorg-server (for Gentoo bug #289946) + 27 Dec 2009; Andrew Gaffney <agaffney@gentoo.org> autoconfig: Use /etc/.noxdm intead of /etc/init.d/.noxdm for Gentoo bug #286308 @@ -237,7 +237,6 @@ list_services() { svcs="${svcs} $(check_svc ${PASSWD} pwgen)" svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)" svcs="${svcs} $(check_svc ${SSH} sshd)" - svcs="${svcs} $(check_svc ${X11} mkxf86config x-setup)" ### TODO: make this baselayout-2 compatible ### TODO: make these checks accurate using service dependencies @@ -642,17 +641,7 @@ start() { [ -n "${XDESC}" ] && einfo "VideoCard: ${HILITE}${XDESC}${NORMAL}" - if [ "${X11}" = "yes" ] - then - if [ -x /etc/init.d/mkxf86config ] - then - /etc/init.d/mkxf86config start - fi - if [ -x /etc/init.d/x-setup ] - then - /etc/init.d/x-setup start - fi - else + if [ "${X11}" = "no" ] touch /etc/.noxdm fi diff --git a/x-setup b/x-setup deleted file mode 100755 index ec57e16..0000000 --- a/x-setup +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# Check for an xorg.conf -if [ ! -e /etc/X11/xorg.conf ] -then - echo "ERROR: /etc/X11/xorg.conf cannot be found! Exiting" - exit 1 -fi - -if [ -f /sbin/livecd-functions.sh ] -then - source /sbin/livecd-functions.sh -else - echo "ERROR: /sbin/livecd-functions.sh could not be loaded!" - exit 1 -fi - -livecd_check_root || exit 1 - -#first, get paths right if we're getting started b4 login -source /etc/profile - -livecd_get_cmdline || exit 1 - -for x in $CMDLINE -do - if [ "$x" = "agpgart" ] - then - modprobe agpgart > /dev/null 2>&1 - fi -done - -get_video_cards || exit 1 - -if [ -x /usr/sbin/opengl-update-livecd ] -then - /usr/sbin/opengl-update-livecd $GLTYPE -elif [ -x /usr/bin/eselect -a -e /usr/share/eselect/modules/opengl.eselect ] -then - /usr/bin/eselect opengl set $GLTYPE --dst-prefix=/etc/opengl -elif [ -x /usr/sbin/opengl-update ] -then - /usr/sbin/opengl-update --dst-prefix=/etc/opengl $GLTYPE -else - echo "ERROR: no opengl-update script can be located" - exit 1 -fi - -#exec /usr/bin/xinit diff --git a/x-setup.init b/x-setup.init deleted file mode 100755 index b2daca3..0000000 --- a/x-setup.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/runscript - -depend() { - before xdm local - need mkxf86config -} - -start() { - ebegin "Configuring OpenGL" - /usr/sbin/x-setup - eend $? -} |