integ/base/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch
Scott Little bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 10:06:31 -04:00

33 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