Skip to content

Commit

Permalink
Merge pull request #7237 from gurevichmark/SUSE_brand
Browse files Browse the repository at this point in the history 
Check SUSE-brand file on SLES
  • Loading branch information
@besawn
besawn committed Aug 17, 2022
2 parents 8f0c862 + 23df8f0 commit 9df17c8
Show file tree
Hide file tree
Showing 21 changed files with 48 additions and 26 deletions.
13 changes: 12 additions & 1 deletion xCAT-server/lib/xcat/plugins/updatenode.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3352,7 +3352,7 @@ sub updateOS
$version =~ s/[^0-9]*([0-9]+).*/$1/;
}

# SUSE Linux
# SUSE Linux 12 and earlier
elsif (
`ssh -o ConnectTimeout=5 $node "test -f /etc/SuSE-release && echo 'SuSE'"`
)
Expand All @@ -3363,6 +3363,17 @@ sub updateOS
$version =~ s/[^0-9]*([0-9]+).*/$1/;
}

# SUSE Linux 15 and later
elsif (
`ssh -o ConnectTimeout=5 $node "test -f /etc/SUSE-brand && echo 'SuSE'"`
)
{
$installOS = "sles";
chomp($version =
`ssh $node "tr -d '.' < /etc/SUSE-brand" | grep VERSION`);
$version =~ s/[^0-9]*([0-9]+).*/$1/;
}

# Everything else
else
{
Expand Down
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ EOF

# Being called from <image>.postinstall script
# Assume we are on the same machine
if [ -f /etc/SuSE-release ]; then
if [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
chroot "$IMGROOTPATH" rpm -e --noscripts --allmatches mlnx-ofa_kernel-kmp-default 2>/dev/null
chroot "$IMGROOTPATH" rpm -e --nodeps --allmatches libibverbs 2>/dev/null
elif grep -q Ubuntu /etc/os-release 2>/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/ib/scripts/configiba.1port
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ then
if [ -f /etc/redhat-release ]
then
OS_name="redhat"
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="suse"
else
Expand Down
4 changes: 2 additions & 2 deletions xCAT-server/share/xcat/ib/scripts/configiba.2ports
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ then
if [ -f /etc/redhat-release ]
then
OS_name="redhat"
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="suse"
else
Expand Down Expand Up @@ -142,7 +142,7 @@ do
if [ -f /etc/redhat-release ]
then
OS_name="redhat"
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="suse"
else
Expand Down
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/netboot/add-on/torque/add_torque
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ echo "export PATH=\$PATH:$TORQUEDIR/\$XARCH/bin:$TORQUEDIR/\$XARCH/sbin" >>etc/p
echo "export PBS_DEFAULT=$TORQUESERVER" >>etc/profile.d/torque.sh
chmod 755 etc/profile.d/torque.*

if [ -r /etc/SuSE-release ]
if [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ]
then
cp $XCATROOT/share/xcat/netboot/add-on/torque/pbs_mom.suse etc/init.d/pbs_mom
cp $XCATROOT/share/xcat/netboot/add-on/torque/pbs_mom.suse sbin/rcpbs_mom
Expand Down
4 changes: 3 additions & 1 deletion xCAT-server/share/xcat/netboot/suse/genimage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,10 @@ unless (grep /af_packet/, @ndrivers) {
unshift(@ndrivers, "af_packet.ko");
}

# Check both possible SLES files for version number.
# "--no-messages" suppresses "grep: <file>: No such file or directory"
my $osver_host;
if (`grep VERSION /etc/SuSE-release` =~ /VERSION = (\d+)/) {
if (`grep --no-messages VERSION /etc/SuSE-release /etc/SUSE-brand` =~ /VERSION = (\d+)/) {
$osver_host = $1;
} else {
$osver_host = 11;
Expand Down
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/scripts/xHRM
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ elif [ "bridgeprereq" = "$1" ]; then
fi

#now save the settings into the config files so that they will be persistent among reboots
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]] || [[ -f /etc/SUSE-brand ]]; then
nwdir="/etc/sysconfig/network"
isSLES=1
elif [ -f "/etc/debian_version" ];then
Expand Down
3 changes: 3 additions & 0 deletions xCAT-server/share/xcat/tools/go-xcat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ function check_linux_distro()
echo "${ID}")"
[[ -z "${distro}" && -f /etc/redhat-release ]] && distro="rhel"
[[ -z "${distro}" && -f /etc/SuSE-release ]] && distro="sles"
[[ -z "${distro}" && -f /etc/SUSE-brand ]] && distro="sles"
echo "${distro}"
}

Expand All @@ -528,6 +529,8 @@ function check_linux_version()
/etc/redhat-release)"
[[ -z "${ver}" && -f /etc/SuSE-release ]] &&
ver="$(awk '/VERSION/ { print $NF }' /etc/SuSE-release)"
[[ -z "${ver}" && -f /etc/SUSE-brand ]] &&
ver="$(awk '/VERSION/ { print $NF }' /etc/SUSE-brand)"
echo "${ver}"
}

Expand Down
2 changes: 2 additions & 0 deletions xCAT-server/share/xcat/tools/mktoolscenter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ my $OSVER = "unknown";

if (-e '/etc/SuSE-release') {
$OSVER = `grep -h VERSION /etc/SuSE-release |awk '{print $3}'`
} elsif (-e '/etc/SUSE-brand') {
$OSVER = `grep -h VERSION /etc/SUSE-brand |awk '{print $3}'`
} elsif (-e '/etc/redhat-release') {
$OSVER = "rhels" . `cat /etc/redhat-release |cut -f7 -d' '`;
chomp($OSVER);
Expand Down
2 changes: 1 addition & 1 deletion xCAT-server/xCAT-wsapi/xcatws.cgi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3449,7 +3449,7 @@ sub fetchParameters {
# in the sles 11.x, the 'PUTDATA' param is not supported for PUT method
# so we have to work around it by getting it by myself
unless ($pdata) {
if (-f "/etc/SuSE-release") { # SUSE os
if ((-f "/etc/SuSE-release") || (-f "/etc/SUSE-brand")) { # SUSE os
if ($ENV{'CONTENT_TYPE'} =~ /json/) {
$q->read_from_client(\$pdata, $ENV{'CONTENT_LENGTH'});
}
Expand Down
2 changes: 1 addition & 1 deletion xCAT-test/autotest/testcase/probe/detect_dhcpd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ -e "/etc/redhat-release" ]; then
if [ "$?" != "0" ] ;then
yum install -y tcpdump
fi
elif [ -e "/etc/SuSE-release" ]; then
elif [ -e "/etc/SuSE-release" ] || [ -e "/etc/SUSE-brand" ]; then
rpm -qa |grep tcpdump
if [ "$?" != "0" ] ;then
zypper -n install tcpdump
Expand Down
4 changes: 2 additions & 2 deletions xCAT-vlan/install/postscripts/configvlan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [[ -z $VLANMAXINDEX ]] || [[ $VLANMAXINDEX -eq 0 ]]; then
fi

if [[ $OSTYPE = linux* ]]; then
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]] || [[ -f /etc/SUSE-brand ]]; then
nwdir="/etc/sysconfig/network"
isSLES=1
else
Expand Down Expand Up @@ -260,7 +260,7 @@ EOF
hostname $VLANHOSTNAME

#change the hostname permanently
if [ -f /etc/SuSE-release ]
if [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
#SLES x
echo $VLANHOSTNAME > /etc/HOSTNAME
Expand Down
4 changes: 2 additions & 2 deletions xCAT-vlan/install/postscripts/deconfigvlan
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [[ -z $VLANMAXINDEX ]] || [[ $VLANMAXINDEX -eq 0 ]]; then
fi

if [[ $OSTYPE = linux* ]]; then
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]] || [[ -f /etc/SUSE-brand ]]; then
nwdir="/etc/sysconfig/network"
isSLES=1
else
Expand Down Expand Up @@ -206,7 +206,7 @@ while [ $index -le $VLANMAXINDEX ]; do
hostname $NODE

#change the hostname permanently
if [ -f /etc/SuSE-release ]
if [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
#SLES x
echo $NODE > /etc/HOSTNAME
Expand Down
2 changes: 1 addition & 1 deletion xCAT/postscripts/configfirewall
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ if (-f "/etc/redhat-release")
#system($cmd);
xCAT::Utils->enableservice("iptables");
}
elsif (-f "/etc/SuSE-release")
elsif ((-f "/etc/SuSE-release") || (-f "/etc/SUSE-brand"))
{
my $conffile;
my $conf;
Expand Down
2 changes: 1 addition & 1 deletion xCAT/postscripts/configib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ then
if [ -f /etc/redhat-release ]
then
OS_name="redhat"
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="suse"
elif [ -f /etc/os-release ] && cat /etc/os-release |grep NAME|grep Ubuntu>/dev/null
Expand Down
4 changes: 2 additions & 2 deletions xCAT/postscripts/enablekdump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ for i in `/bin/cat /proc/cmdline`; do
done

if [ ! -z "$MACX" ] && [ ! -z "$ETHX" ]; then
if (pmatch $OSVER "sle*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
if (pmatch $OSVER "sle*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
CONFFILE=$MNTDIR/etc/sysconfig/network/ifcfg-$ETHX
fi
if (pmatch $OSVER "fedora*") || (pmatch $OSVER "rhel6*") || (pmatch $OSVER "rhels6*") || [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ];then
Expand Down Expand Up @@ -104,7 +104,7 @@ if [ ! -z "$DUMP" ]; then
fi

if [ "$KDPROTO" = "nfs" ]; then
if (pmatch $OSVER "sle*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
if (pmatch $OSVER "sle*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
if (pmatch $OSVER "*10*"); then
#run mkinitrd to generater the kdump-init base
if (pmatch $ARCH "x86*"); then
Expand Down
2 changes: 1 addition & 1 deletion xCAT/postscripts/killsyslog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# (so /a can be umounted cleanly)
# SI post-install scripts run in a chroot environment of the final OS image

if [ -f "/etc/SuSE-release" ];then
if [ -f "/etc/SuSE-release" ] || [ -f "/etc/SUSE-brand" ] ;then
str_out=`ps -ef | grep -v grep | grep syslog-ng`
if [ $? -eq 0 ];then
str_id=`echo $str_out | awk '{print $2}'`
Expand Down
6 changes: 3 additions & 3 deletions xCAT/postscripts/routeop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ replace_persistent_route()
if [ -f /etc/redhat-release ]
then
OS_name="redhat" #it can be RedHatFerdora or CentOS
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="sles"
else
Expand Down Expand Up @@ -407,7 +407,7 @@ add_persistent_route()
if [ -f /etc/redhat-release ]
then
OS_name="redhat" #it can be RedHatFerdora or CentOS
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="sles"
else
Expand Down Expand Up @@ -647,7 +647,7 @@ rm_persistent_route()
if [ -f /etc/redhat-release ]
then
OS_name="redhat" #it can be RedHatFerdora or CentOS
elif [ -f /etc/SuSE-release ]
elif [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]
then
OS_name="sles"
else
Expand Down
4 changes: 2 additions & 2 deletions xCAT/postscripts/setupntp.traditional
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if [ $OS_TYPE = Linux ]; then

mkdir -p /var/lib/ntp
chown ntp /var/lib/ntp
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ];then
echo "driftfile /var/lib/ntp/drift/ntp.drift" >>$conf_file
else
echo "driftfile /var/lib/ntp/drift" >>$conf_file
Expand Down Expand Up @@ -135,7 +135,7 @@ if [ $OS_TYPE = Linux ]; then
hwclock --systohc --utc

#setup the RTC is UTC format, which will be used by os
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ];then
grep -i -q "HWCLOCK" /etc/sysconfig/clock
if [ $? -eq 0 ];then
sed -i 's/.*HWCLOCK.*/HWCLOCK=\"-u\"/' /etc/sysconfig/clock
Expand Down
2 changes: 1 addition & 1 deletion xCAT/postscripts/syslog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ if [ "$(uname -s)" = "Linux" ]; then
fi
fi
else
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
if ( pmatch $OSVER "sle*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ] || [ -f /etc/SUSE-brand ]; then
#find out which syslog is used for SLES, syslog or syslog-ng
result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
if ( pmatch $result "*syslog-ng*" ); then
Expand Down
6 changes: 5 additions & 1 deletion xCAT/postscripts/xcatdsklspost
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,10 +537,14 @@ else # for common mode MODE=1,2,3,5 (updatenode,moncfg,node deployment)
# download poscripts has not worked yet
#try the dhcp server, this is used for initial boot for the node.
if [ $downloaded -eq 0 ]; then
#setup $OSVER ,for SLES11
#setup $OSVER ,for SLES12 and earlier
if [ -e '/etc/SuSE-release' ]; then
OSVER=`grep -h VERSION /etc/SuSE-release |awk '{print $3}'`
fi
#setup $OSVER ,for SLES15 and later
if [ -e '/etc/SUSE-brand' ]; then
OSVER=`grep -h VERSION /etc/SUSE-brand |awk '{print $3}'`
fi
SIPS=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*eth*.leases 2> /dev/null|awk '{print $3}'|sed -e 's/;//'`
if [ -z "$SIPS" ]; then
SIPS=`grep -h dhcp-server-identifier /var/lib/dhclient/dhclient*hf*.leases 2> /dev/null|awk '{print $3}'|sed -e 's/;//'`
Expand Down

0 comments on commit 9df17c8

Please sign in to comment.