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 3CACC138247 for ; Thu, 21 Nov 2013 09:06:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04C41E09FA; Thu, 21 Nov 2013 09:06:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 463F1E09F8 for ; Thu, 21 Nov 2013 09:06:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29B0C33F257 for ; Thu, 21 Nov 2013 09:06:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6129BE54C9 for ; Thu, 21 Nov 2013 09:06:32 +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: <1385024410.968cb74cbe7a7bcbdef80a0dd46f696db2d746af.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 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: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 968cb74cbe7a7bcbdef80a0dd46f696db2d746af X-VCS-Branch: 3.0 Date: Thu, 21 Nov 2013 09:06:32 +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: a99b0a3a-c7d8-48ac-a691-ae7dbb60e4fa X-Archives-Hash: 33ea92f467d388f2e7c34f2e6c9b6f2a commit: 968cb74cbe7a7bcbdef80a0dd46f696db2d746af Author: W. Trevor King tremily us> AuthorDate: Sat Mar 2 19:17:01 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Nov 21 09:00:10 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=968cb74c 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 5e578b0..0a3fa3f 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -171,8 +171,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