From 8389cc378a42baa1be52a03e89f7560d099c6b7e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Mar 2008 10:15:12 +0000 Subject: [PATCH] * Hack: don't restart dbus automatically, it kills the X server. Apparantly the cause was not the upgrade to DBus 1.1.20 but something else. svn path=/nixos/trunk/; revision=11095 --- system/switch-to-configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/switch-to-configuration.sh b/system/switch-to-configuration.sh index 3fd038e20f8..e3fd59910cb 100644 --- a/system/switch-to-configuration.sh +++ b/system/switch-to-configuration.sh @@ -73,7 +73,7 @@ if test "$action" = "switch" -o "$action" = "test"; then # Hack: skip the sys-* and ctrl-alt-delete events. # Another hack: don't restart the X server (that would kill all the clients). - if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver"; then continue; fi + if echo "$event" | grep -q "^sys-\|^ctrl-\|^xserver|^dbus"; then continue; fi if ! test -e "$oldEvents/$event"; then echo "starting $event..."