diff options
| author | Dirk von Suchodoletz | 2007-01-30 02:16:42 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-01-30 02:16:42 +0100 |
| commit | 310de34ff207c9ece84fc060bc9861f73b0c5967 (patch) | |
| tree | 7a5a561a2f5f6530e849d2cf62103972d97e49a8 | |
| parent | Entry for (open)suse10.2 is needed in (deprecated) ld4-inst ... (diff) | |
| download | core-310de34ff207c9ece84fc060bc9861f73b0c5967.tar.gz core-310de34ff207c9ece84fc060bc9861f73b0c5967.tar.xz core-310de34ff207c9ece84fc060bc9861f73b0c5967.zip | |
Some chipsets (IGP) are not able to use fglrx, cleanup in file to be
excluded via stage3 etc setup ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@656 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | initramfs/distro-specs/suse/config-default | 2 | ||||
| -rw-r--r-- | initramfs/distro-specs/suse/functions-10.1 | 3 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/initramfs/distro-specs/suse/config-default b/initramfs/distro-specs/suse/config-default index 890cdccd..aa4db0bb 100644 --- a/initramfs/distro-specs/suse/config-default +++ b/initramfs/distro-specs/suse/config-default @@ -36,7 +36,7 @@ D_SYSCONFDIR=/sysconfig D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n*.rpmorig\n*.rpmnew\n\ *.YaST2save\netc/autoinstall\nlogrotate*\nbootloader\n*~\n\ *.SuSEconfig.saved\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\ -X11/xdm/pixmaps\n*.rpmsave\ndhclient*script\nX11/xorg.conf*\n" +X11/xdm/pixmaps\n*.rpmsave\ndhclient*script\nxorg.conf.*" D_BINDMPTS="tmp root media home" D_DIRINBINDMNT="/var/run /var/log /var/tmp" D_RODIRSINRW="/etc/opt/gnome/gconf /etc/X11/xkb /var/adm /var/lib/texmf \ diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1 index ceb29061..604f3d84 100644 --- a/initramfs/distro-specs/suse/functions-10.1 +++ b/initramfs/distro-specs/suse/functions-10.1 @@ -122,6 +122,9 @@ checkgraphix () { # test if unionfs case "${XMODULE}" in radeon) + # IGP is not supported with fglrx driver (at least not in some versions) + # comment if it works properly ... + strinfile " IGP" /tmp/hwsetup.info && exit # check ${XDESC}/ hwsetup.info device string in Cards file and then # for needed components # not all radeon cards are properly supported by fglrx, so the decision on diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 53b6b931..eac22b2b 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -490,7 +490,7 @@ elif [ -z "$COWLOOP" ] ; then for i in ${D_RCDIRS} ${D_INITBOOTD} ; do echo "*$i/*" >>/tmp/etc.exclude done - echo -e "${D_ETCEXCL} @@@COMETCEXCL@@@" >>/tmp/etc.exclude + echo -e "${D_ETCEXCL}\n@@@COMETCEXCL@@@" >>/tmp/etc.exclude # if ld.so.cache is to be generated then do not copy the file [ -z "${NOLDSC}" ] && echo -e "ld.so.cache*" >>/tmp/etc.exclude # for tar exclude lists might be used, more difficult for cp |