From 4a6ccf0ca53d0d6010bb07c009693a5e3d18cabf Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Fri, 13 May 2022 13:05:11 -0400 Subject: [PATCH] Update docker build containers to CentOS8 (3) --- xCAT-genesis-scripts/xCAT-genesis-scripts.spec | 1 - xCAT-probe/xCAT-probe.spec | 2 +- xCAT-server/share/xcat/install/scripts/post.esx | 1 + xCAT-server/share/xcat/install/scripts/post.rh.common | 1 + xCAT-server/share/xcat/install/scripts/post.rhel5.s390x | 2 +- xCAT-server/share/xcat/install/scripts/post.rhel6.s390x | 2 +- xCAT-server/share/xcat/install/scripts/post.rhels7 | 1 + xCAT-server/share/xcat/install/scripts/post.rhels8 | 1 + xCAT-server/share/xcat/install/scripts/post.xcat | 1 + xCAT-server/share/xcat/install/scripts/post.xcat.ng | 1 + xCAT-server/share/xcat/install/scripts/pre.pkvm3 | 1 + xCAT-vlan/xCAT_plugin/vlan.pm | 2 +- xCAT/postscripts/disableconsistentNICrename | 2 +- xCAT/postscripts/efibootmgr | 1 + xCAT/postscripts/joindomain | 1 + xCAT/postscripts/serialconsole | 1 + xCAT/postscripts/xcatlib.sh | 1 + 17 files changed, 16 insertions(+), 6 deletions(-) diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec index bab373378..48edf3267 100755 --- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec +++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec @@ -70,7 +70,6 @@ touch /etc/xcat/genesis-scripts-updated %Files %defattr(-,root,root) -#%dir %attr(-,root,root) %{rpminstallroot} %{rpminstallroot}/usr/bin/allowcred.awk %{rpminstallroot}/usr/bin/bmcsetup %{rpminstallroot}/usr/bin/raidcmd diff --git a/xCAT-probe/xCAT-probe.spec b/xCAT-probe/xCAT-probe.spec index b5730e42c..432c78213 100644 --- a/xCAT-probe/xCAT-probe.spec +++ b/xCAT-probe/xCAT-probe.spec @@ -11,7 +11,7 @@ Vendor: IBM Corp. Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} Prefix: /opt/xcat BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root -PreReq: xCAT-client = 4:%{version}-%{release} +Requires: xCAT-client = 4:%{version}-%{release} %ifos linux BuildArch: noarch diff --git a/xCAT-server/share/xcat/install/scripts/post.esx b/xCAT-server/share/xcat/install/scripts/post.esx index 267a95f83..5e8792726 100644 --- a/xCAT-server/share/xcat/install/scripts/post.esx +++ b/xCAT-server/share/xcat/install/scripts/post.esx @@ -1,3 +1,4 @@ +#!/bin/bash # # Setup hostname # diff --git a/xCAT-server/share/xcat/install/scripts/post.rh.common b/xCAT-server/share/xcat/install/scripts/post.rh.common index f5b5092c5..e70463d50 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rh.common +++ b/xCAT-server/share/xcat/install/scripts/post.rh.common @@ -1,3 +1,4 @@ +#!/bin/bash # # Setup hostname # diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x index 75fac1d46..42d8eb55a 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x @@ -1,4 +1,4 @@ - +#!/bin/bash # Get hostname export HOSTNAME=$(host $IP 2>/dev/null | awk '{print $5}' | awk -F. '{print $1}') hostname $HOSTNAME diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x index e1ed1f169..b75fa5f3b 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x @@ -1,4 +1,4 @@ - +#!/bin/bash # Get hostname export HOSTNAME=$(host $IP 2>/dev/null | awk '{print $5}' | awk -F. '{print $1}') hostname $HOSTNAME diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels7 b/xCAT-server/share/xcat/install/scripts/post.rhels7 index f4960e2be..e6dac201f 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhels7 +++ b/xCAT-server/share/xcat/install/scripts/post.rhels7 @@ -1,3 +1,4 @@ +#!/bin/bash #the nic name might change between the installation and 1st boot #active all the nics with network link during system boot diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels8 b/xCAT-server/share/xcat/install/scripts/post.rhels8 index f3db34069..a45862796 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhels8 +++ b/xCAT-server/share/xcat/install/scripts/post.rhels8 @@ -1,3 +1,4 @@ +#!/bin/bash # The nic name might change between the installation and 1st boot # Active all the nics with network link during system boot diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat index bfcea68f0..369ac66ec 100755 --- a/xCAT-server/share/xcat/install/scripts/post.xcat +++ b/xCAT-server/share/xcat/install/scripts/post.xcat @@ -1,3 +1,4 @@ +#!/bin/bash # # Run xCAT post install # diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat.ng b/xCAT-server/share/xcat/install/scripts/post.xcat.ng index cbbad65be..bbabcd1fe 100644 --- a/xCAT-server/share/xcat/install/scripts/post.xcat.ng +++ b/xCAT-server/share/xcat/install/scripts/post.xcat.ng @@ -1,3 +1,4 @@ +#!/bin/bash # # Run xCAT post install # diff --git a/xCAT-server/share/xcat/install/scripts/pre.pkvm3 b/xCAT-server/share/xcat/install/scripts/pre.pkvm3 index 30c620266..f0fd4f17d 100755 --- a/xCAT-server/share/xcat/install/scripts/pre.pkvm3 +++ b/xCAT-server/share/xcat/install/scripts/pre.pkvm3 @@ -1,3 +1,4 @@ +#!/bin/bash export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#" if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then set -x diff --git a/xCAT-vlan/xCAT_plugin/vlan.pm b/xCAT-vlan/xCAT_plugin/vlan.pm index ea09d397b..349bac58d 100755 --- a/xCAT-vlan/xCAT_plugin/vlan.pm +++ b/xCAT-vlan/xCAT_plugin/vlan.pm @@ -1,4 +1,4 @@ - +#!/usr/bin/perl #------------------------------------------------------- =head1 diff --git a/xCAT/postscripts/disableconsistentNICrename b/xCAT/postscripts/disableconsistentNICrename index 90f33c039..5a90c3099 100755 --- a/xCAT/postscripts/disableconsistentNICrename +++ b/xCAT/postscripts/disableconsistentNICrename @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh #modify the grub.cfg to prevent nic consistent network renameing grep -E -q "net.ifnames=0" /etc/sysconfig/grub || sed -i '/^GRUB_CMDLINE_LINUX=.*/{s/"$/ net.ifnames=0"/}' /etc/sysconfig/grub grep -E -q "net.ifnames=0" /etc/default/grub || sed -i '/^GRUB_CMDLINE_LINUX=.*/{s/"$/ net.ifnames=0"/}' /etc/default/grub diff --git a/xCAT/postscripts/efibootmgr b/xCAT/postscripts/efibootmgr index 833b0af89..3404c77b1 100644 --- a/xCAT/postscripts/efibootmgr +++ b/xCAT/postscripts/efibootmgr @@ -1,2 +1,3 @@ +#!/bin/bash echo "Setting Boot Manager for the next boot." efibootmgr -c -l \\EFI\\redhat\\grub.efi -L Linux diff --git a/xCAT/postscripts/joindomain b/xCAT/postscripts/joindomain index 6db214f0f..6f32dc9a4 100644 --- a/xCAT/postscripts/joindomain +++ b/xCAT/postscripts/joindomain @@ -1,3 +1,4 @@ +#!/bin/bash #step 1, determine the realm and such DNSDOMAIN=`dnsdomainname` UPDNSDOMAIN=`echo $DNSDOMAIN|tr a-z A-Z` diff --git a/xCAT/postscripts/serialconsole b/xCAT/postscripts/serialconsole index 72c589e40..d5f50e68d 100755 --- a/xCAT/postscripts/serialconsole +++ b/xCAT/postscripts/serialconsole @@ -1,3 +1,4 @@ +#!/bin/bash # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html if [ -n "$LOGLABEL" ]; then log_label=$LOGLABEL diff --git a/xCAT/postscripts/xcatlib.sh b/xCAT/postscripts/xcatlib.sh index 604a6ac86..5ea888fcb 100755 --- a/xCAT/postscripts/xcatlib.sh +++ b/xCAT/postscripts/xcatlib.sh @@ -1,3 +1,4 @@ +#!/bin/bash function hashencode(){ local str_map="$1" echo `echo $str_map | sed 's/\./xDOTx/g' | sed 's/:/xCOLONx/g' | sed 's/,/:xCOMMAx/g' | sed 's/-/xHYPHENx/g'`