summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorJoseph Sutton <josephsutton@catalyst.net.nz>2022-10-10 13:54:08 +1300
committerStefan Metzmacher <metze@samba.org>2022-11-24 11:01:37 +0000
commit2dcd8369fe7e6c7664f5e18324e85e0c4eebb2d5 (patch)
tree579720e8ee114ccc026f10555090478a0d12fcbe /bootstrap
parent3dbe8fd66ca7d98fd05f5ff9ed9e414b9dd1915b (diff)
downloadsamba-2dcd8369fe7e6c7664f5e18324e85e0c4eebb2d5.tar.gz
bootstrap: Remove duplicate line from CentOS 8 powertools install
This was missed in 136ec5bc01e2648bae34a1158f923fbf5a86d561 when we moved to CentOS 8 stream. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/config.py3
-rwxr-xr-xbootstrap/generated-dists/centos8s/bootstrap.sh3
-rw-r--r--bootstrap/sha1sum.txt2
3 files changed, 3 insertions, 5 deletions
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 7f29670f091..79e19308fdb 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -245,8 +245,7 @@ yum install -y dnf-plugins-core
yum install -y epel-release
yum -v repolist all
-yum config-manager --set-enabled powertools -y || \
- yum config-manager --set-enabled powertools -y
+yum config-manager --set-enabled powertools -y
yum update -y
diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index cc3d92eaeb4..0dc04a843dd 100755
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -12,8 +12,7 @@ yum install -y dnf-plugins-core
yum install -y epel-release
yum -v repolist all
-yum config-manager --set-enabled powertools -y || \
- yum config-manager --set-enabled powertools -y
+yum config-manager --set-enabled powertools -y
yum update -y
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index fb988930857..7a78c020f24 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-9750e28fd7d913d3f1dd9a9cc0b49b712735b713
+a5335bb5004bdcba5ab7e064164d5e70b76bea0f