867dddc305
Use initscripts-config package to package script and service file for initscripts package. Refactor 0001-Disable-zeroconf-route.patch， spec-add-mountnfs-init-script.patch and spec-include-TiS-changes.patch, let initscripts-config to be responsible for the installation of config/script/service files. Merged some meta patches that just includes adding source code patch to spec-include-Tis-changes.patch. Removed base/procps since it just includes one file, sysctl.conf. And move this file to initscripts-config folder.The monitor-tools package in stx-integ has a %post script that is adding an entry to sysctl.conf, so add "Requires: initscripts-config" in monitor-tools.spec, to ensure it is installed after this package replaces the file. Deployment test and ping test between VMs pass Service, config and script files check pass. Story: 2003768 Task: 27585 Change-Id: I2ea3bd05bdc5bca5658d157e6f40f7380e922500 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
27 lines
923 B
Diff
27 lines
923 B
Diff
From 2c096cfd84fea55fd1f2df466d5635c06daab2a2 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 14:49:27 -0400
|
|
Subject: [PATCH] WRS: fix-build-failures-due-to-unwanted-sgid.patch
|
|
|
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
|
---
|
|
SPECS/initscripts.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
|
|
index 967317f..ad32f19 100644
|
|
--- a/SPECS/initscripts.spec
|
|
+++ b/SPECS/initscripts.spec
|
|
@@ -227,7 +227,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
%ghost %attr(0664,root,utmp) /var/run/utmp
|
|
%ghost %attr(0644,root,root) /etc/sysconfig/kvm
|
|
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
|
|
-%dir /usr/lib/tmpfiles.d
|
|
+%dir %attr(0755,root,root) /usr/lib/tmpfiles.d
|
|
/usr/lib/tmpfiles.d/initscripts.conf
|
|
%dir /usr/libexec/initscripts
|
|
%dir /usr/libexec/initscripts/legacy-actions
|
|
--
|
|
1.8.3.1
|
|
|