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 112E7138247 for ; Fri, 22 Nov 2013 07:13:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B1E2E0AC2; Fri, 22 Nov 2013 07:13:31 +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 B94DCE0AC3 for ; Fri, 22 Nov 2013 07:13:30 +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 B0F2A33F30F for ; Fri, 22 Nov 2013 07:13:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8F3FFD00FE for ; Fri, 22 Nov 2013 07:13:26 +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: <1385100109.bd8c7e969c103bcd1d1d7064cc2614c489e9f6d0.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:rewrite-on-master 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: bd8c7e969c103bcd1d1d7064cc2614c489e9f6d0 X-VCS-Branch: rewrite-on-master Date: Fri, 22 Nov 2013 07:13:26 +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: cc753983-73af-4c25-9e59-503b35f86250 X-Archives-Hash: c4b9eb65f831b37c02c6d68ae47ea9fc commit: bd8c7e969c103bcd1d1d7064cc2614c489e9f6d0 Author: W. Trevor King tremily us> AuthorDate: Sun Mar 3 12:58:16 2013 +0000 Commit: Brian Dolbec gmail 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