1c8c71654f
Use openssh-config package to package config and service files for openssh package. Merge adding source patch and spec related change to one meta patch named spec-include-Tis-chnages.patch. Deployment test and ping test between VMs pass Config files check pass. Story: 2003768 Task: 27588 Change-Id: I77cd054707d11dace1c47e8477d0e30b69719a38 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 7eefd34e4adc9a4c88fc667f99bf76e967270813 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:32:16 -0400
|
|
Subject: [PATCH 6/7] WRS:
|
|
openssh-init-script-kill-old-instances-on-start.patch
|
|
|
|
---
|
|
SOURCES/sshd.init | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/SOURCES/sshd.init b/SOURCES/sshd.init
|
|
index 8901b4f..cd8b4ab 100755
|
|
--- a/SOURCES/sshd.init
|
|
+++ b/SOURCES/sshd.init
|
|
@@ -60,6 +60,14 @@ start()
|
|
# Create keys if necessary
|
|
/usr/sbin/sshd-keygen
|
|
|
|
+ # In rare instances, sshd may be started but a pid
|
|
+ # file is not generated. This is seen usually during
|
|
+ # system reboot scenarios. A subsequent attempt to start
|
|
+ # sshd here will trigger a port bind error. As a sanity
|
|
+ # check attempt a kill call (mostly redundant) to any
|
|
+ # previously running sshd instance
|
|
+ /bin/kill `/usr/sbin/pidof "$SSHD"` >/dev/null 2>&1
|
|
+
|
|
echo -n $"Starting $prog: "
|
|
$SSHD $OPTIONS && success || failure
|
|
RETVAL=$?
|
|
--
|
|
1.9.1
|