From c38ea82ac6314f41cb17aa831351d40c219449b2 Mon Sep 17 00:00:00 2001 From: zhipengl Date: Mon, 5 Nov 2018 23:56:49 +0800 Subject: [PATCH] Refactor patches for initscripts package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- monitor-tools/centos/monitor-tools.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor-tools/centos/monitor-tools.spec b/monitor-tools/centos/monitor-tools.spec index a282ca3..84322e0 100644 --- a/monitor-tools/centos/monitor-tools.spec +++ b/monitor-tools/centos/monitor-tools.spec @@ -8,7 +8,8 @@ Packager: Wind River URL: unknown BuildArch: noarch Source: %name-%version.tar.gz -#Requires: /usr/bin/perl + +Requires: initscripts-config %description This package contains data collection tools to monitor host performance.