[gentoo-catalyst] [PATCH] livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession

[gentoo-catalyst] [PATCH] livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession

[W. Trevor King]

From: "W. Trevor King" <wking@tremily.us>

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 77d694e..d95d537 100644
--- 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
-- 
1.8.2.rc0.16.g20a599e

[gentoo-catalyst] Re: [PATCH] livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession

[W. Trevor King]

[-- Attachment #1: Type: text/plain, Size: 879 bytes --]

On Sat, Mar 02, 2013 at 02:24:29PM -0500, W. Trevor King wrote:
> --- 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

This also needs an etc-update run.  I'm not sure where the best place
to do that is.  Maybe put an env-update call at the end of
livecdfs-update.sh?  Maybe update_env_settings?  Add a new phase to
the livecd-stage2?

Thoughts?
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]