diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-07-18 19:35:36 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-07-18 19:35:36 +0000 |
| commit | f79b441f87bab0c5926321a3a30f2c18cc3e7730 (patch) | |
| tree | ae073ff624f0b3216abaae4a2d8e596adab2083a /src/livecd-tools | |
| parent | version 2.20, revision 1.94 (diff) | |
| download | gentoo-f79b441f87bab0c5926321a3a30f2c18cc3e7730.tar.gz gentoo-f79b441f87bab0c5926321a3a30f2c18cc3e7730.tar.bz2 gentoo-f79b441f87bab0c5926321a3a30f2c18cc3e7730.zip | |
Force mkxf86config to run before x-setup by calling it explicitly to workaround a possible release problem.
Diffstat (limited to 'src/livecd-tools')
| -rw-r--r-- | src/livecd-tools/autoconfig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/livecd-tools/autoconfig b/src/livecd-tools/autoconfig index ea8bd46a9e..411a77404d 100644 --- a/src/livecd-tools/autoconfig +++ b/src/livecd-tools/autoconfig @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/livecd-tools/autoconfig,v 1.65 2006/07/16 13:45:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/livecd-tools/autoconfig,v 1.66 2006/07/18 19:35:36 wolf31o2 Exp $ DHCP="yes" DETECT="yes" @@ -64,7 +64,7 @@ get_config() { depend() { need modules before net -# provide gpm pcmcia apmd acpid coldplug hdparm alsasound x-setup +# provide gpm pcmcia apmd acpid coldplug hdparm alsasound mkxf86config x-setup } # Checks whether a service will be started by autoconfig. @@ -93,7 +93,7 @@ list_services() { svcs="${svcs} $(check_svc ${GPM} gpm)" svcs="${svcs} $(check_svc ${HOTPLUG} coldplug hotplug)" svcs="${svcs} $(check_svc ${ALSA} alsasound)" - svcs="${svcs} $(check_svc ${X11} x-setup)" + svcs="${svcs} $(check_svc ${X11} mkxf86config x-setup)" echo ${svcs} } @@ -432,12 +432,13 @@ start() { if [ "${X11}" = "yes" ] then + if [ -x /etc/init.d/mkxf86config ] + then + start_service mkxf86config + fi if [ -x /etc/init.d/x-setup ] then start_service x-setup - elif [ -x /etc/init.d/mkxf86config ] - then - start_service mkxf86config fi else touch /etc/init.d/.noxdm |