From e85e2e544f470478c25f3ac9492dfdaf637607be Mon Sep 17 00:00:00 2001 From: Joao Victor Portal Date: Wed, 27 Oct 2021 18:56:02 -0300 Subject: [PATCH] Added new script to '/usr/local/bin' folder Added the new utility script 'change_system_private_registry.sh' to the '/usr/local/bin' folder. Test Plan: PASS: Create an AIO-SX using a new ISO created with this change and verify that the file '/usr/local/bin/change_system_private_registry.sh' is present and is executable. Closes-Bug: 1948491 Signed-off-by: Joao Victor Portal Change-Id: Ied984fdcca6b702cef22451fedbb2edda190401b --- utilities/platform-util/centos/platform-util.spec | 2 ++ utilities/platform-util/debian/deb_folder/controller.install | 1 + .../debian/deb_folder/platform-util-controller.install | 1 + utilities/platform-util/debian/deb_folder/rules | 5 +++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/utilities/platform-util/centos/platform-util.spec b/utilities/platform-util/centos/platform-util.spec index 940789ca..d497f80b 100644 --- a/utilities/platform-util/centos/platform-util.spec +++ b/utilities/platform-util/centos/platform-util.spec @@ -66,6 +66,7 @@ install -m 555 %{_buildsubdir}/scripts/gen-bootloader-iso.sh %{buildroot}%{local install -m 555 %{_buildsubdir}/scripts/stx-iso-utils.sh %{buildroot}%{local_bindir} install -m 555 %{_buildsubdir}/scripts/show-certs.sh %{buildroot}%{local_bindir} install -m 555 %{_buildsubdir}/scripts/update_docker_registry_auth.sh %{buildroot}%{local_bindir} +install -m 555 %{_buildsubdir}/scripts/change_system_private_registry.sh %{buildroot}%{local_bindir} install -d %{buildroot}%{local_etc_initd} install %{_buildsubdir}/scripts/log_functions.sh %{buildroot}%{local_etc_initd} @@ -117,6 +118,7 @@ systemctl enable opt-platform.service %{local_bindir}/stx-iso-utils.sh %{local_bindir}/show-certs.sh %{local_bindir}/update_docker_registry_auth.sh +%{local_bindir}/change_system_private_registry.sh %files noncontroller %defattr(-,root,root,-) diff --git a/utilities/platform-util/debian/deb_folder/controller.install b/utilities/platform-util/debian/deb_folder/controller.install index 1bc12653..7bfaa93a 100644 --- a/utilities/platform-util/debian/deb_folder/controller.install +++ b/utilities/platform-util/debian/deb_folder/controller.install @@ -3,3 +3,4 @@ scripts/show-certs.sh usr/local/bin scripts/stx-iso-utils.sh usr/local/bin scripts/update-iso.sh usr/local/bin scripts/update_docker_registry_auth.sh usr/local/bin +scripts/change_system_private_registry.sh usr/local/bin diff --git a/utilities/platform-util/debian/deb_folder/platform-util-controller.install b/utilities/platform-util/debian/deb_folder/platform-util-controller.install index 75ed7cb0..156b4470 100644 --- a/utilities/platform-util/debian/deb_folder/platform-util-controller.install +++ b/utilities/platform-util/debian/deb_folder/platform-util-controller.install @@ -3,3 +3,4 @@ /usr/local/bin/stx-iso-utils.sh /usr/local/bin/update-iso.sh /usr/local/bin/update_docker_registry_auth.sh +/usr/local/bin/change_system_private_registry.sh diff --git a/utilities/platform-util/debian/deb_folder/rules b/utilities/platform-util/debian/deb_folder/rules index ec97e9e0..5c0f9fcf 100755 --- a/utilities/platform-util/debian/deb_folder/rules +++ b/utilities/platform-util/debian/deb_folder/rules @@ -34,6 +34,7 @@ override_dh_auto_install: install -m 555 scripts/stx-iso-utils.sh $(DEBIAN_BUILDDIR)/usr/local/bin/ install -m 555 scripts/show-certs.sh $(DEBIAN_BUILDDIR)/usr/local/bin/ install -m 555 scripts/update_docker_registry_auth.sh $(DEBIAN_BUILDDIR)/usr/local/bin/ + install -m 555 scripts/change_system_private_registry.sh $(DEBIAN_BUILDDIR)/usr/local/bin/ install -m 555 scripts/is-rootdisk-device.sh $(DEBIAN_BUILDDIR)/usr/local/bin/ install -m 755 scripts/connectivity_test $(DEBIAN_BUILDDIR)/usr/local/bin/ install -m 750 scripts/set_keystone_user_option.sh $(DEBIAN_BUILDDIR)/usr/local/bin/ @@ -47,5 +48,5 @@ override_dh_auto_install: override_dh_fixperms: dh_fixperms -Xupdate-iso.sh -Xgen-bootloader-iso.sh -Xstx-iso-utils.sh \ - -Xshow-certs.sh -Xupdate_docker_registry_auth.sh -Xis-rootdisk-device.sh \ - -Xpatch-restart-* -Xconnectivity_test -Xset_keystone_user_option.sh + -Xshow-certs.sh -Xupdate_docker_registry_auth.sh -Xchange_system_private_registry.sh \ + -Xis-rootdisk-device.sh -Xpatch-restart-* -Xconnectivity_test -Xset_keystone_user_option.sh