[gentoo-commits] proj/catalyst:rewrite-on-master commit in: targets/support/

[gentoo-commits] proj/catalyst:rewrite-on-master commit in: targets/support/

[Brian Dolbec]

commit:     38c9c900235c819b5f14dfcdef0d7de0e769be14
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Mar  8 12:26:16 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Nov 22 06:01:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=38c9c900

livecdfs-update.sh: Run env-update to pick up any /etc/env.d/ changes

Otherwise the XSESSION change from e523136 (livecdfs-update.sh: Set
XSESSION in /etc/env.d/90xsession, 2013-03-02) is not noticed.

---
 targets/support/livecdfs-update.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 141fe59..3f05927 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -383,3 +383,5 @@ if [ -e /lib/rcscripts/addons/udev-start.sh ]
 then
 	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
 fi
+
+env-update

[gentoo-commits] proj/catalyst:rewrite-on-master commit in: targets/support/

[Brian Dolbec]

commit:     8642a0c4146d1170f5eee8073e68223c25ecf723
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Mar  2 19:17:01 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Nov 22 06:01:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8642a0c4

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 620ad7e..141fe59 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

[gentoo-commits] proj/catalyst:rewrite-on-master commit in: targets/support/

[Brian Dolbec]

commit:     bd8c7e969c103bcd1d1d7064cc2614c489e9f6d0
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sun Mar  3 12:58:16 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Nov 22 06:01:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bd8c7e96

livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

sshd_config lives in /etc/ssh, not /etc/sshd.  This typo has been
present since the block was introduced by c06264e (Initial import of
Catalyst 2.0.0, 2005-04-04), so it's obviously not a widely used
feature ;).  It might be better to just remove the block entirely.

---
 targets/support/livecdfs-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a1ae134..620ad7e 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -5,7 +5,7 @@ RUN_DEFAULT_FUNCS="no"
 source /tmp/chroot-functions.sh
 
 # Allow root logins to our CD by default
-if [ -e /etc/sshd/sshd_config ]
+if [ -e /etc/ssh/sshd_config ]
 then
 	sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
 		/etc/ssh/sshd_config