From 71758ecf290066473f476424f15efcd0655cfb34 Mon Sep 17 00:00:00 2001
From: Simon J Mudd <sjmudd@pobox.com>
Date: Fri, 4 Dec 2020 20:16:40 +0100
Subject: [PATCH 1/2] Add root checks and given an appropriate message if not
 running as root

---
 setup-docker.sh    | 5 +++++
 setup-kubetools.sh | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/setup-docker.sh b/setup-docker.sh
index 7f359cc..2be6fde 100755
--- a/setup-docker.sh
+++ b/setup-docker.sh
@@ -2,6 +2,11 @@
 # script that runs 
 # https://kubernetes.io/docs/setup/production-environment/container-runtime
 
+if [ $(id -u) != 0 ]; then
+  echo "Please run as root or use sudo."
+  exit 1
+fi
+
 yum install -y vim yum-utils device-mapper-persistent-data lvm2
 yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
 
diff --git a/setup-kubetools.sh b/setup-kubetools.sh
index 3869386..741031e 100755
--- a/setup-kubetools.sh
+++ b/setup-kubetools.sh
@@ -2,6 +2,11 @@
 # kubeadm installation instructions as on
 # https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/
 
+if [ $(id -u) != 0 ]; then
+  echo "Please run as root or use sudo."
+  exit 1
+fi
+
 cat <<EOF > /etc/yum.repos.d/kubernetes.repo
 [kubernetes]
 name=Kubernetes

From 06ccf81b33f444e56fc271025bc1f6764ed5f6ec Mon Sep 17 00:00:00 2001
From: Simon J Mudd <sjmudd@pobox.com>
Date: Fri, 4 Dec 2020 20:46:42 +0100
Subject: [PATCH 2/2] Improve swap check to catch more patterns

---
 setup-kubetools.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup-kubetools.sh b/setup-kubetools.sh
index 741031e..f9fd7ef 100755
--- a/setup-kubetools.sh
+++ b/setup-kubetools.sh
@@ -21,9 +21,11 @@ EOF
 setenforce 0
 sed -i 's/^SELINUX=enforcing$/SELINUX=permissive/' /etc/selinux/config
 
-# disable swap (assuming that the name is /dev/centos/swap
-sed -i 's/^\/dev\/mapper\/centos-swap/#\/dev\/mapper\/centos-swap/' /etc/fstab
-swapoff /dev/mapper/centos-swap
+# disable swap (assuming that the name is /dev/centos*/swap)
+for device in $(sed -e 's/#.*//' /etc/fstab | awk '$2 == "swap" { print $1 }' | grep ^/dev/); do
+    swapoff $device
+    sed -i -e "s,$device,#$device," /etc/fstab
+done
 
 yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes