From 572a7f65b8c752dcf4a14106896812949d358c6a Mon Sep 17 00:00:00 2001
From: Martin Sivak <msivak@redhat.com>
Date: Thu, 28 Feb 2013 14:07:35 +0100
Subject: Fix the window manager script

---
 firstboot-windowmanager | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/firstboot-windowmanager b/firstboot-windowmanager
index ede6fa9..b4fb12c 100755
--- a/firstboot-windowmanager
+++ b/firstboot-windowmanager
@@ -1,8 +1,16 @@
 #!/bin/sh
-WMS="metacity"
-for WM in $WMS; do
-    FILE=$(which $WM)
-    if [ -x "$FILE" ]; then
+
+# This is the list of supported window manager binaries
+WMS=("metacity" "kwin" "xfwm4" "openbox" "marco")
+
+for WM in ${WMS[@]}; do
+    FILE=$(which $WM 2>/dev/null)
+    FOUND=$?
+
+    if [ $FOUND -eq 0 -a -x "$FILE" ]; then
         exec "$FILE" "$@"
     fi
 done
+
+# No known window manager found
+exit 1
-- 
cgit