diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:12:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:12:50 (GMT) |
| commit | 0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d (patch) | |
| tree | dfaec8f4334fd0cb9aece599c0fe69a809bbbdb8 /abs/core-testing/LinHES-config/xconfig.sh | |
| parent | 8aaf1c6cb3aca9ee0c95b9b5464c6fa40587e56b (diff) | |
| download | linhes_pkgbuild-0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d.zip linhes_pkgbuild-0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d.tar.gz linhes_pkgbuild-0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d.tar.bz2 | |
Fixed UUID detection for upgrades when /myth is NOT partition 3
Fixed missing xorg.conf on install for "unsupported cards".
The problem was due to X-configure not running because X was already running for the install.
Diffstat (limited to 'abs/core-testing/LinHES-config/xconfig.sh')
| -rwxr-xr-x | abs/core-testing/LinHES-config/xconfig.sh | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/abs/core-testing/LinHES-config/xconfig.sh b/abs/core-testing/LinHES-config/xconfig.sh index ef3e836..1d845b0 100755 --- a/abs/core-testing/LinHES-config/xconfig.sh +++ b/abs/core-testing/LinHES-config/xconfig.sh @@ -189,9 +189,9 @@ function setupX { fi fi ;; - VMware ) - sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vmware > $XORG_CONF - ;; + # VMware ) + # sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vmware > $XORG_CONF + # ;; VIA ) sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.via > $XORG_CONF @@ -213,9 +213,22 @@ function setupX { vesa) sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $TEMPLATES/xorg/xorg.conf.vesa > $XORG_CONF ;; - *) XCONF=/root/xorg.conf.new + *) + XCONF=/root/xorg.conf.new + XCONFB=/etc/X11/xorg.conf.install X -configure - grep -v Modes $XCONF | sed -e '/Depth.*16/a Modes "800x600"' -e '/Depth.*24/a Modes "800x600"' -e 's/dev\/mouse/dev\/psaux/g'> $XORG_CONF + if [ -f $XCONF ] + then + echo "Using $XCONF" + grep -v Modes $XCONF | sed -e "/Depth.*16/a Modes \"${Xres}\" " -e "/Depth.*24/a Modes \"${Xres}\"" -e 's/dev\/mouse/dev\/psaux/g'> $XORG_CONF + + elif [ -f $XCONFB ] + then + echo "Using $XCONFB" + sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" $XCONFB > $XORG_CONF + else + echo "Xorg configuration failed" + fi rm -f $XCONF 2>&1 > /dev/null ;; esac |