From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-catalyst+bounces-2630-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 0EFDC198005
	for <garchives@archives.gentoo.org>; Sun,  3 Mar 2013 16:14:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8AC03E07FE;
	Sun,  3 Mar 2013 16:14:04 +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 0406CE07FE
	for <gentoo-catalyst@lists.gentoo.org>; Sun,  3 Mar 2013 16:14:03 +0000 (UTC)
Received: from [192.168.1.210] (unknown [24.86.176.233])
	(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	(Authenticated sender: dolsen)
	by smtp.gentoo.org (Postfix) with ESMTPSA id EEFD233DC14;
	Sun,  3 Mar 2013 16:14:02 +0000 (UTC)
Message-ID: <1362327217.25081.12.camel@big_daddy.dol-sen.ca>
Subject: Re: [gentoo-catalyst] [PATCH] livecdfs-update.sh: Fix '/etc/sshd'
 check for sshd_config tweaks
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: "W. Trevor King" <wking@tremily.us>
Date: Sun, 03 Mar 2013 08:13:37 -0800
In-Reply-To: <a0100e7d5c8905c99230cac46b963718d3826f5a.1362315628.git.wking@tremily.us>
References: 
	<a0100e7d5c8905c99230cac46b963718d3826f5a.1362315628.git.wking@tremily.us>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.6.3 
Precedence: bulk
List-Post: <mailto:gentoo-catalyst@lists.gentoo.org>
List-Help: <mailto:gentoo-catalyst+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-catalyst+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-catalyst+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-catalyst.gentoo.org>
X-BeenThere: gentoo-catalyst@lists.gentoo.org
Reply-to: gentoo-catalyst@lists.gentoo.org
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Archives-Salt: e945f2ee-e550-4f42-9bb9-4bec9ec6ab23
X-Archives-Hash: af471500266f96b37f53c85c674e3b78

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.