[gentoo-catalyst] [PATCH] livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

[gentoo-catalyst] [PATCH] livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

[W. Trevor King]

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

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(-)
 mode change 100644 => 100755 targets/support/livecdfs-update.sh

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
index 77d694e..f4b2c45
--- 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
-- 
1.8.2.rc0.16.g20a599e

Re: [gentoo-catalyst] [PATCH] livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

[Brian Dolbec]

On Sun, 2013-03-03 at 08:01 -0500, W. Trevor King wrote:
> From: "W. Trevor King" <wking@tremily.us>
> 
> 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(-)
>  mode change 100644 => 100755 targets/support/livecdfs-update.sh
> 
> diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
> old mode 100644
> new mode 100755
> index 77d694e..f4b2c45
> --- 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


It would be better to move the hard coding out of the bash script and
either into the config defaults or in this case (it's only used in the
one target) added to the target stage py file.  In that way the default
value can be overwritten in the target spec file. 

Re: [gentoo-catalyst] [PATCH] livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

[W. Trevor King]

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

On Sun, Mar 03, 2013 at 08:13:37AM -0800, Brian Dolbec wrote:
> On Sun, 2013-03-03 at 08:01 -0500, W. Trevor King wrote:
> > 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.
> > ---
> > …
> It would be better to move the hard coding out of the bash script and
> either into the config defaults or in this case (it's only used in the
> one target) added to the target stage py file.  In that way the default
> value can be overwritten in the target spec file. 

I think I'd rather remove this block entirely.  Adding a separate
“enable root logins via SSH” option (and phase?) doesn't sound very
appealing.  This sort of thing is better suited to a per-user
fsscript, especially if the in-catalyst support has always been
broken.

Cheers,
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 --]