Skip to content

Commit 13aeccf

Browse files
committed
rpm-upgrade.sh - sles/suse detection
Without disto/distro_name being passed we'll use the pkg_cmd as the check to see if this is a sles/suse distro.
1 parent a61e1d6 commit 13aeccf

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

scripts/rpm-upgrade.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ upgrade_type_mode
1818
upgrade_test_type "$test_type"
1919

2020
package_version=${mariadb_version/mariadb-/}
21-
distro=$version_name
2221

2322
bb_print_env
2423

@@ -141,7 +140,7 @@ echo "$package_list" | xargs sudo "$pkg_cmd" "$pkg_cmd_options" install ||
141140
case $(expr "$prev_major_version" '<' "10.1")"$systemdCapability" in
142141
0yes)
143142
sudo systemctl start mariadb
144-
if [[ $distro != *"sles"* ]] && [[ $distro != *"suse"* ]]; then
143+
if [ "$pkg_cmd" != "zypper" ]; then
145144
sudo systemctl enable mariadb
146145
else
147146
bb_log_warn "due to MDEV-23044 mariadb service won't be enabled in the test"

0 commit comments

Comments
 (0)