The branch, build-main has been updated via 41876ae4b3b6f8565fd7b240697b3a1d9e6f1354 (commit) from a556af711cb84c952da664ee30cbb88cfedcbc3c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver-xsession/etc/Xsession | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c4fcebf..35d97fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low xfree86 symlink to base rulset does not exist. - Grab systemd service file from Fedora and ship it upstream. - Provide RHEL/Fedora support in x2goserver-xsession. + - Only sanity check for existence of /etc/x2go/Xsession.d on Debian + (derived) systems. * x2goserver.spec: + Ship x2goserver.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). File differs from the Fedora diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 243be76..9630db8 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -87,10 +87,6 @@ exec >>"$ERRFILE" 2>&1 echo "$PROGNAME: X session started for $LOGNAME at $(date)" -# sanity check; is our session script directory present? -if [ ! -d "$SYSSESSIONDIR" ]; then - errormsg "no \"$SYSSESSIONDIR\" directory found; aborting." -fi # Attempt to create a file of non-zero length in /tmp; a full filesystem can # cause mysterious X session failures. We do not use touch, :, or test -w @@ -107,6 +103,11 @@ rm -f "$WRITE_TEST" if [ -f /etc/debian_version ]; then + # sanity check; is our session script directory present? + if [ ! -d "$SYSSESSIONDIR" ]; then + errormsg "no \"$SYSSESSIONDIR\" directory found; aborting." + fi + # use run-parts to source every file in the session directory; we source # instead of executing so that the variables and functions defined above # are available to the scripts, and so that they can pass variables to each hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).