summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rwxr-xr-xliveinst/liveinst.xinit9
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 589f031b4..9d25855f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-03-23 Jeremy Katz <katzj@redhat.com>
+ * liveinst/liveinst.xinit: Don't cause xinit to exit
+
* gui.py (InstallControlWindow.connectSignals): Exit if the close
button is clicked (#231775)
diff --git a/liveinst/liveinst.xinit b/liveinst/liveinst.xinit
index f4e47d7fe..a4da9074a 100755
--- a/liveinst/liveinst.xinit
+++ b/liveinst/liveinst.xinit
@@ -2,8 +2,7 @@
# Set up a launcher on the desktop for the live installer if we're on
# a live CD
-test -f /.livecd-configured || exit 0
-
-test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
-
-cp /usr/share/applications/liveinst.desktop ${XDG_DESKTOP_DIR:-$HOME/Desktop}
+if [ -f /.livecd-configured ]; then
+ test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
+ cp /usr/share/applications/liveinst.desktop ${XDG_DESKTOP_DIR:-$HOME/Desktop}
+fi