make stop-slim user for stopslim_cmd

3 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adb7e355a09e..2474cb52ddfa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = slim-xserver-ready
 	pkgdesc = graphical login manager for X11 with xserver_ready command
 	pkgver = 1.3.6
-	pkgrel = 8
+	pkgrel = 9
 	url = http://sourceforge.net/projects/slim.berlios/
 	arch = i686
 	arch = x86_64
@@ -44,6 +44,6 @@ pkgbase = slim-xserver-ready
 	sha256sums = 5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def
 	sha256sums = a6d021e52661c74914dc1c4a08ffbd7fce63da41005bfe006e252a74c57c9b70
 	sha256sums = 03149c9f5afb4679e9421d9965ecc126c0b159636212000aca98cb674b531ca7
-	sha256sums = 86f7b11fadc70769efaa5861924d52aef86e6bcd7137073cb29f8d2b725f1648
+	sha256sums = b5ec2da4d3fa62b59efe14412347825f21ad471b6131cfd9b60aee7aff70c661
 
 pkgname = slim-xserver-ready
diff --git a/PKGBUILD b/PKGBUILD
index 2ce92722128e..5df73d60f5be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,10 +12,12 @@
 #   make your own sessiondir with numerically storted sessions;
 #   eg 01.desktop 02.desktop etc etc. The display names are
 #   taken from the desktop files.
+#   Added a stop-slim login and stopslim_cmd option to be
+#   used to turn off slim.
 
 pkgname=slim-xserver-ready
 pkgver=1.3.6
-pkgrel=8
+pkgrel=9
 pkgdesc="graphical login manager for X11 with xserver_ready command"
 arch=('i686' 'x86_64' 'aarch64')
 url="http://sourceforge.net/projects/slim.berlios/"
@@ -49,7 +51,7 @@ sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df'
             '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def'
             'a6d021e52661c74914dc1c4a08ffbd7fce63da41005bfe006e252a74c57c9b70'
             '03149c9f5afb4679e9421d9965ecc126c0b159636212000aca98cb674b531ca7'
-            '86f7b11fadc70769efaa5861924d52aef86e6bcd7137073cb29f8d2b725f1648'
+            'b5ec2da4d3fa62b59efe14412347825f21ad471b6131cfd9b60aee7aff70c661'
             )
 
 prepare() {
diff --git a/slim-xserver-ready.patch b/slim-xserver-ready.patch
index b892321bed82..d5ef9d4a60f5 100644
--- a/slim-xserver-ready.patch
+++ b/slim-xserver-ready.patch
@@ -27,7 +27,7 @@ diff -uprw slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
  			pw = getpwnam("root");
  			break;
  		case Panel::Console:
-@@ -747,6 +752,28 @@ void App::Halt() {
+@@ -747,6 +752,34 @@ void App::Halt() {
  	exit(OK_EXIT);
  }
  
@@ -41,15 +41,21 @@ diff -uprw slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
 +	};
 +#endif
 +
++	std::string cmd = cfg->getOption("stopslim_cmd");
 +	/* Write message */
-+	//LoginPanel->Message((char*)cfg->getOption("Stopping Slim").c_str());
-+	LoginPanel->Message((char*)"Stopping Slim");
++	if(!cmd.empty()) {
++		LoginPanel->Message((char*)"Stopping Slim");
++	} else {
++		LoginPanel->Message((char*)"Not stopping Slim");
++		sleep(3);
++		return;
++	}
 +	sleep(3);
 +
 +	/* Stop server and then execiute the stopslim_cmd */
 +	StopServer();
 +	RemoveLock();
-+	system(cfg->getOption("stopslim_cmd").c_str());
++	system(cmd.c_str());
 +	exit(OK_EXIT);
 +}
 +