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 8737C1387B2 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 2DB30E09FB; 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 62C20E09FD 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 327D833F2CA 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 42CA9E54C7 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.2596eb8ce4958255561a11e2081647d2cacf772e.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: 2596eb8ce4958255561a11e2081647d2cacf772e 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: b282e95d-7a8e-4dbf-8778-80c45cf1c55d X-Archives-Hash: dc023c2fb7c463ceeefdf59ce8f15ce5 commit: 2596eb8ce4958255561a11e2081647d2cacf772e Author: W. Trevor King tremily us> AuthorDate: Sun Mar 3 12:58:16 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=2596eb8c 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 0928f17..5e578b0 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