summaryrefslogtreecommitdiffstats
path: root/mga-bg-res/mga-bg-res.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mga-bg-res/mga-bg-res.sh')
-rwxr-xr-xmga-bg-res/mga-bg-res.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/mga-bg-res/mga-bg-res.sh b/mga-bg-res/mga-bg-res.sh
index 79c0e68..888db1a 100755
--- a/mga-bg-res/mga-bg-res.sh
+++ b/mga-bg-res/mga-bg-res.sh
@@ -5,7 +5,9 @@ theme="Mageia-Default"
curlink=$(readlink $bgpath/default.png)
# Search for the optimal background resolution according to monitor-edid
-if [ -e /usr/sbin/monitor-edid ]; then
+# Skip this during a local install (drakx-in-chroot or draklive2), as
+# monitor-edid sometimes hangs when run in a nested X session.
+if [ -e /usr/sbin/monitor-edid -a -z "$LOCAL_INSTALL" ]; then
res=$(exec /usr/sbin/monitor-edid | grep -m 1 ModeLine) # => ModeLine "1920x1080" ...
res=$(expr "$res" : '.*"\(.*\)".*') # isolate the resolution
fi