Unverified Commit 02dccd32 authored by Erik Wilson's avatar Erik Wilson Committed by GitHub

Merge pull request #1835 from evrardjp/remove-trailing-whitespaces

Remove trailing whitespaces
parents d4d99872 eabc82c7
...@@ -404,7 +404,7 @@ fi ...@@ -404,7 +404,7 @@ fi
# IOSCHED_CFQ CFQ_GROUP_IOSCHED # IOSCHED_CFQ CFQ_GROUP_IOSCHED
flags=" flags="
BLK_CGROUP BLK_DEV_THROTTLING BLK_CGROUP BLK_DEV_THROTTLING
CGROUP_PERF CGROUP_PERF
CGROUP_HUGETLB CGROUP_HUGETLB
NET_CLS_CGROUP $netprio NET_CLS_CGROUP $netprio
......
...@@ -8,5 +8,5 @@ cd $(dirname $0)/.. ...@@ -8,5 +8,5 @@ cd $(dirname $0)/..
airgap_image_file='scripts/airgap/image-list.txt' airgap_image_file='scripts/airgap/image-list.txt'
images=$(cat "${airgap_image_file}") images=$(cat "${airgap_image_file}")
xargs -n1 docker pull <<< "${images}" xargs -n1 docker pull <<< "${images}"
docker save ${images} -o dist/artifacts/k3s-airgap-images-${ARCH}.tar docker save ${images} -o dist/artifacts/k3s-airgap-images-${ARCH}.tar
cp "${airgap_image_file}" dist/artifacts/k3s-images.txt cp "${airgap_image_file}" dist/artifacts/k3s-images.txt
...@@ -54,7 +54,7 @@ if ! grep "BEGIN PGP PRIVATE KEY BLOCK" <<<"$PRIVATE_KEY"; then ...@@ -54,7 +54,7 @@ if ! grep "BEGIN PGP PRIVATE KEY BLOCK" <<<"$PRIVATE_KEY"; then
exit 0 exit 0
fi fi
cat <<\EOF >~/.rpmmacros cat <<\EOF >~/.rpmmacros
%_signature gpg %_signature gpg
%_gpg_name ci@rancher.com %_gpg_name ci@rancher.com
EOF EOF
......
...@@ -11,7 +11,7 @@ fi ...@@ -11,7 +11,7 @@ fi
if [[ $HOME = /go/* ]]; then if [[ $HOME = /go/* ]]; then
echo 'Must not launch vagrant from /go/' echo 'Must not launch vagrant from /go/'
exit 1 exit 1
fi fi
cd cd
# --- Default to root user for vagrant ssh # --- Default to root user for vagrant ssh
......
...@@ -16,7 +16,7 @@ auto-mtu() { ...@@ -16,7 +16,7 @@ auto-mtu() {
} }
# probe for any modules that may be needed # probe for any modules that may be needed
modprobe wireguard modprobe wireguard
modprobe tun modprobe tun
# try wireguard kernel module first # try wireguard kernel module first
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment