summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-11-20 02:22:18 +0100
committerDirk von Suchodoletz2006-11-20 02:22:18 +0100
commit0d82010bdb9a85212a63069de5c9c2e7c5480d2d (patch)
tree046fbf8c4c52754453285e85087524bf4bb0dca2 /initramfs/initrd-stuff
parentSupport for commercial X servers (ATI at the moment ...) (diff)
downloadcore-0d82010bdb9a85212a63069de5c9c2e7c5480d2d.tar.gz
core-0d82010bdb9a85212a63069de5c9c2e7c5480d2d.tar.xz
core-0d82010bdb9a85212a63069de5c9c2e7c5480d2d.zip
Support for nvidia too, still to be checked. Disable parallel start of
runlevel scripts in SuSE (no gain, but trouble), tvout option ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@515 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff')
-rwxr-xr-xinitramfs/initrd-stuff/bin/hwautocfg5
-rw-r--r--initramfs/initrd-stuff/etc/functions4
2 files changed, 5 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index ccd56aa8..ae591673 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -126,8 +126,9 @@ if [ -z "$SCR_MODES" ] ; then #error "$hcfg_res" nonfatal
fi
monmanual=yes
-# check for special X driver (fglrx, nvidia, ...)
-checkglx
+# check for special X driver (fglrx, nvidia, ...) and enable tvout if variable
+# tvout is not "no"
+checkgraphix
# finally write config file
echo -e "#\n# autogenerated X hardware configuration by $0\n# \
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index b657c92f..ac17578a 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -912,8 +912,8 @@ done
# by slxmkramfs from <distro>/functions-default & ~-version
# find out if prerequisites for special X server modules are met (distro
-# specific)
-checkglx () {
+# specific) and enable tvout if required
+checkgraphix () {
:
}