Differential D23579 Diff 68188 head/x11/sddm/files/patch-data_scripts_Xsession

Changeset View

Standalone View

head/x11/sddm/files/patch-data_scripts_Xsession

	Fix use of "$@" (see sh(1)).			Fix use of "$@" (see sh(1)).

	There's no systemd on FreeBSD so start the session using $STARTUP which is			There's no systemd on FreeBSD so start the session using $STARTUP which is
	defined in 90-consolekit if ConsoleKit2 is installed. By default this allows			defined in 90-consolekit if ConsoleKit2 is installed. By default this allows
	local users to shutdown/reboot the machine and access devices like USB keys.			local users to shutdown/reboot the machine and access devices like USB keys.

	Also use dbus-run-session so libdbus doesn't have to autolauch the session bus			Also use dbus-run-session so libdbus doesn't have to autolauch the session bus
	daemon on first use. Autolaunched dbus daemons tend to linger and may only			daemon on first use. Autolaunched dbus daemons tend to linger and may only
	exit if the X server exits.			exit if the X server exits.

	--- data/scripts/Xsession.orig 2017-12-05 16:00:16 UTC			--- data/scripts/Xsession.orig 2019-03-13 09:22:35 UTC
	+++ data/scripts/Xsession			+++ data/scripts/Xsession
	@@ -94,8 +94,8 @@ if [ -f "$USERXSESSION" ]; then			@@ -98,5 +98,5 @@ fi
	. "$USERXSESSION"			if [ -z "$*" ]; then
	fi

	-if [ -z "$@" ]; then
	+if [ -z "$1" ]; then
	exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."			exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
	else			else
	- exec $@			- exec $@
	+ exec $STARTUP /usr/bin/dbus-run-session --dbus-daemon=/usr/bin/dbus-daemon -- "$@"			+ exec $STARTUP /usr/bin/dbus-run-session --dbus-daemon=/usr/bin/dbus-daemon -- "$@"
	fi			fi