Merge branch 'master' of git://openpandora.org/openpandora.oe

diff --git a/recipes/pandora-system/pandora-scripts/gui.conf b/recipes/pandora-system/pandora-scripts/gui.conf
index 6546b9f..aec5a94 100644 (file)
--- a/recipes/pandora-system/pandora-scripts/gui.conf
+++ b/recipes/pandora-system/pandora-scripts/gui.conf
@@ -1,3 +1,3 @@
 XFCE4;The full desktop Environment;startxfce4;xfce4-session-logout --logout
-MiniMenu;A very simple but flexible menu;startmmenu;kill -3 mmenu
-PMenu;A gaming-console-style Launcher;pmenu;kill pmenu
+MiniMenu;A very simple but flexible menu;startmmenu;killall -3 mmenu
+PMenu;A gaming-console-style Launcher;pmenu;killall pmenu

diff --git a/recipes/pandora-system/pandora-skel/.xinitrc b/recipes/pandora-system/pandora-skel/.xinitrc
index 77a9664..803ac6d 100644 (file)
--- a/recipes/pandora-system/pandora-skel/.xinitrc
+++ b/recipes/pandora-system/pandora-skel/.xinitrc
@@ -42,7 +42,7 @@ fi
 xmodmap ~/.pndXmodmap
 
 # HUP pndnotifyd to make sure it picks up the users home.
-kill -1 pndnotifyd &
+killall -1 pndnotifyd &
 
 # The following variable defines the session which is started if the user
 # doesn't explicitely select a session in SLiM.