Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/
Date: Thu, 18 Jul 2019 17:32:27
Message-Id: 1563470814.6c6b3d9b7294a171a7c01ac981fee95cb0e3a94c.whissi@gentoo
1 commit: 6c6b3d9b7294a171a7c01ac981fee95cb0e3a94c
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 18 17:26:54 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 18 17:26:54 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6c6b3d9b
7
8 initrd.scripts: start_sshd(): Don't start sshd when network wasn't started
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 defaults/initrd.scripts | 6 ++++++
13 1 file changed, 6 insertions(+)
14
15 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
16 index cdd5a2e..bc19fff 100644
17 --- a/defaults/initrd.scripts
18 +++ b/defaults/initrd.scripts
19 @@ -1829,6 +1829,12 @@ start_sshd() {
20 return
21 fi
22
23 + if [ ! -f "${GK_NET_LOCKFILE}" ]
24 + then
25 + warn_msg "Network not started; Not starting sshd ..."
26 + return
27 + fi
28 +
29 if [ ! -x "/usr/sbin/dropbear" ]
30 then
31 bad_msg "/usr/sbin/dropbear not found! Did you call genkernel with --ssh parameter?"