From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7EA23138ADA for ; Thu, 26 Feb 2015 20:19:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 133CAE097B; Thu, 26 Feb 2015 20:19:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEA45E097B for ; Thu, 26 Feb 2015 20:19:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) by smtp.gentoo.org (Postfix) with ESMTP id 8F0AE340C2E for ; Thu, 26 Feb 2015 20:19:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B3F1129E7 for ; Thu, 26 Feb 2015 20:12:44 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1424978121.733a4e2104be329020f492780720821138f5cb48.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 733a4e2104be329020f492780720821138f5cb48 X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8b9db317-2ad4-4b10-bb31-e324830d979d X-Archives-Hash: ed909ee28e347a78f8a0f18e76e3900f commit: 733a4e2104be329020f492780720821138f5cb48 Author: W. Trevor King tremily us> AuthorDate: Sat Mar 2 19:17:01 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:21 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=733a4e21 livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession As part of the OpenRC migration, the recommended place for configuring the default X session moved from /etc/rc.conf to /etc/env.d/90xsession [1]. [1]: http://www.gentoo.org/doc/en/openrc-migration.xml --- targets/support/livecdfs-update.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 60a9a6f..d16248e 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -170,8 +170,7 @@ fi # Setup configured default X Session if [ -n "${clst_livecd_xsession}" ] then - sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \ - /etc/rc.conf + echo "XSESSION=\"${clst_livecd_xsession}\"" > /etc/env.d/90xsession fi # touch /etc/asound.state From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BC6D6138A87 for ; Thu, 26 Feb 2015 19:25:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3295AE09D0; Thu, 26 Feb 2015 19:25:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D027CE09D0 for ; Thu, 26 Feb 2015 19:25:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04F90340BF5 for ; Thu, 26 Feb 2015 19:25:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2F8C129D6 for ; Thu, 26 Feb 2015 19:25:31 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1424978121.733a4e2104be329020f492780720821138f5cb48.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 733a4e2104be329020f492780720821138f5cb48 X-VCS-Branch: pending Date: Thu, 26 Feb 2015 19:25:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f069d296-51b0-4e31-80e8-25a5a7ee2b66 X-Archives-Hash: 17ae598c49e869f8d4d3d81f76d9aa66 Message-ID: <20150226192531.xHEUyHLIKE4yxheu0rmbIwZer4vPPEedY-BQC2Zh5Gk@z> commit: 733a4e2104be329020f492780720821138f5cb48 Author: W. Trevor King tremily us> AuthorDate: Sat Mar 2 19:17:01 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:21 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=733a4e21 livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession As part of the OpenRC migration, the recommended place for configuring the default X session moved from /etc/rc.conf to /etc/env.d/90xsession [1]. [1]: http://www.gentoo.org/doc/en/openrc-migration.xml --- targets/support/livecdfs-update.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 60a9a6f..d16248e 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -170,8 +170,7 @@ fi # Setup configured default X Session if [ -n "${clst_livecd_xsession}" ] then - sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \ - /etc/rc.conf + echo "XSESSION=\"${clst_livecd_xsession}\"" > /etc/env.d/90xsession fi # touch /etc/asound.state