Fix console/ssh login banner revert to default issue

Closes-Bug: 1794329

It is due to the "overwrite default issue file" cmd rebased to wrong
position when do CentOS7.5 upgrade.
Also rename the meta patch filename to align with the PATCH_ORDER.

Change-Id: Ic081e213c002ea8a3d4b59a98d342bfa04c6b0fc
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-26 18:56:06 +08:00 committed by Dean Troyer
parent 2a05a16e54
commit ddbe0e69c9
3 changed files with 15 additions and 10 deletions

View File

@ -1,14 +1,14 @@
From e18f905977fa94fa20a2d9a9cc565dc8d7fe8dac Mon Sep 17 00:00:00 2001
From 9c4f92869a737451e5827686ce916169d485d3be Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:58:59 -0400
Subject: [PATCH 1/2] WRS: centos-release-include-TiS-changes.patch
Subject: [PATCH] WRS: centos-release-include-TiS-changes.patch
---
SPECS/centos-release.spec | 8 ++++++++
1 file changed, 8 insertions(+)
SPECS/centos-release.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index 67f1550..ce64be4 100644
index 67f1550..02e198e 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -27,6 +27,8 @@ Provides: system-release(releasever) = %{base_release_version}
@ -20,9 +20,9 @@ index 67f1550..ce64be4 100644
%description
%{product_family} release files
@@ -123,6 +125,12 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/
%posttrans
/usr/bin/uname -m | grep -q 'x86_64' && echo 'centos' >/etc/yum/vars/contentdir || echo 'altarch' > /etc/yum/vars/contentdir
@@ -120,10 +122,16 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+# Overwrite default issue files with cgcs related files.
+install -m 0644 %{SOURCE3} %{buildroot}/etc/issue
@ -30,9 +30,14 @@ index 67f1550..ce64be4 100644
+sed -i -e "s/xxxPLATFORM_RELEASExxx/%{platform_release}/g" \
+ %{buildroot}/etc/issue \
+ %{buildroot}/etc/issue.net
+
%posttrans
/usr/bin/uname -m | grep -q 'x86_64' && echo 'centos' >/etc/yum/vars/contentdir || echo 'altarch' > /etc/yum/vars/contentdir
-
%clean
rm -rf %{buildroot}
--
2.7.4

View File

@ -1,2 +1,2 @@
centos-release-include-TiS-changes.patch
0001-Update-package-versioning-for-TIS-format.patch
0001-centos-release-include-TiS-changes.patch
0002-Update-package-versioning-for-TIS-format.patch