From unknown Thu Apr 09 09:46:10 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#414: xinitrd.d path wrong in Xsession Reply-To: Orion Poplawski , 414@bugs.x2go.org Resent-From: Orion Poplawski Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Mon, 27 Jan 2014 18:20:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: report 414 X-X2Go-PR-Package: x2goserver X-X2Go-PR-Keywords: patch Received: via spool by submit@bugs.x2go.org id=B.139084667322648 (code B); Mon, 27 Jan 2014 18:20:02 +0000 Received: (at submit) by bugs.x2go.org; 27 Jan 2014 18:17:53 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham version=3.3.2 Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165]) by ymir (Postfix) with ESMTPS id EE6985DB13 for ; Mon, 27 Jan 2014 19:17:51 +0100 (CET) Received: from [10.10.20.7] (barry.cora.nwra.com [10.10.20.7]) (authenticated bits=0) by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id s0RIHnuj031613 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Mon, 27 Jan 2014 11:17:49 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com; s=default; t=1390846669; bh=Ao84pbNxf4gXnxNMZujHy0LI9+/hp+2oB7aHobaYRoc=; h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type; b=mJ9RFjlriusx7sWSrjLNCK+tu2GtzQBbx/Cu/jGmWDDHq3I5vvbDUD7yLtFTjVP0I aQaR52jbI6SIRazsCBXkXHJ2HJkoKrjBhG6m4zpJ39DsZ4YAhM3rsvs4DmF7xjD1AK tDrHcay2TMfH7WQglrVz1+cSM8082Gke25u68StY= Message-ID: <52E6A2CD.6050701@cora.nwra.com> Date: Mon, 27 Jan 2014 11:17:49 -0700 From: Orion Poplawski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: submit@bugs.x2go.org X-Enigmail-Version: 1.6 Content-Type: multipart/mixed; boundary="------------060108030609000703010100" This is a multi-part message in MIME format. --------------060108030609000703010100 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Package: x2goserver Version: 4.0.1.13 Tags: patch The path to xinitrd.d is wrong in Xsession. Also, add some existence/readability checking. -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder/CoRA Office FAX: 303-415-9702 3380 Mitchell Lane orion@nwra.com Boulder, CO 80301 http://www.nwra.com --------------060108030609000703010100 Content-Type: text/x-patch; name="x2goserver-xinit.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="x2goserver-xinit.patch" diff -up x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession.xinit x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession --- x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession.xinit 2014-01-27 10:41:21.249243220 -0700 +++ x2goserver-4.0.1.13/x2goserver-xsession/etc/Xsession 2014-01-27 10:45:49.541668747 -0700 @@ -174,8 +174,8 @@ elif [ -f /etc/redhat-release ]; then unset XKB_IN_USE # run all system xinitrc shell scripts. - for file in /etc/x2go/xinit/xinitrc.d/* ; do - . $file + for file in /etc/x2go/xinitrc.d/* ; do + [ -r "$file" ] && . $file done # Prefix launch of session with ssh-agent if available and not already running. --------------060108030609000703010100--