bab9bb6b69
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>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 573c0da6014e782b5b598c054e8b6fc90e3cb780 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 17:53:00 -0400
|
|
Subject: [PATCH 03/10] WRS:
|
|
0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
|
|
|
|
---
|
|
SPECS/systemd.spec | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
|
|
index 5474181..912d31e 100644
|
|
--- a/SPECS/systemd.spec
|
|
+++ b/SPECS/systemd.spec
|
|
@@ -1041,6 +1041,7 @@ fi
|
|
rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || :
|
|
rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || :
|
|
|
|
+if [ $1 -eq 1 ]; then
|
|
# Migrate HOSTNAME= from /etc/sysconfig/network
|
|
if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
|
|
unset HOSTNAME
|
|
@@ -1048,6 +1049,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
|
|
[ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || :
|
|
fi
|
|
sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || :
|
|
+fi
|
|
|
|
# Migrate the old systemd-setup-keyboard X11 configuration fragment
|
|
if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then
|
|
@@ -1056,6 +1058,7 @@ else
|
|
rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || :
|
|
fi
|
|
|
|
+if [ 1 -eq 0 ] ; then # TIS: Skip this. We don't want myhostname in nsswitch.conf
|
|
# sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf
|
|
# Only do that when installing, not when updating.
|
|
if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
|
|
@@ -1065,6 +1068,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
|
|
s/[[:blank:]]*$/ myhostname/
|
|
' /etc/nsswitch.conf >/dev/null 2>&1 || :
|
|
fi
|
|
+fi
|
|
|
|
%posttrans
|
|
# Convert old /etc/sysconfig/desktop settings
|
|
--
|
|
1.9.1
|
|
|