integ/base/sanlock/centos/meta_patches/spec-sanlock-systemctl-post-enable-preun-disable.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

40 lines
974 B
Diff

From 2e52b9f2956ac629598e0d0c201af38194904e16 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:45:32 -0400
Subject: [PATCH 2/3] WRS:
spec-sanlock-systemctl-post-enable-preun-disable.patch
---
SPECS/sanlock.spec | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/SPECS/sanlock.spec b/SPECS/sanlock.spec
index 92b81bb..b4996de 100644
--- a/SPECS/sanlock.spec
+++ b/SPECS/sanlock.spec
@@ -108,19 +108,8 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
/usr/sbin/usermod -a -G disk sanlock
%post
-%if %{with_systemd}
-%systemd_post wdmd.service sanlock.service
-%endif
-
-%preun
-%if %{with_systemd}
-%systemd_preun wdmd.service sanlock.service
-%endif
-
-%postun
-%if %{with_systemd}
-%systemd_postun
-%endif
+ /bin/systemctl enable sanlock.service >/dev/null 2>&1 || :
+ /bin/systemctl enable wdmd.service >/dev/null 2>&1 || :
%files
%defattr(-,root,root,-)
--
1.9.1