Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: bashisms - step 1
[releng/builder.git]
/
jenkins-init-scripts
/
ubuntu-docker-ovs.sh
diff --git
a/jenkins-init-scripts/ubuntu-docker-ovs.sh
b/jenkins-init-scripts/ubuntu-docker-ovs.sh
index 743255b6975c2575f00207d485e7411f14f7b767..2bcbd073d9cdb8a9bdc7feefa4cea3742a4af6b1 100755
(executable)
--- a/
jenkins-init-scripts/ubuntu-docker-ovs.sh
+++ b/
jenkins-init-scripts/ubuntu-docker-ovs.sh
@@
-1,4
+1,4
@@
-#!/bin/
ba
sh
+#!/bin/sh
# make sure we don't require tty for sudo operations
cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
# make sure we don't require tty for sudo operations
cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
@@
-14,8
+14,7
@@
sed -i "/127.0.0.1/s/$/\t$(hostname)/" /etc/hosts
# Do the final install of OVS that the has to be done at boot time for
# some reason due to how the snapshots keep behaving.
# Do the final install of OVS that the has to be done at boot time for
# some reason due to how the snapshots keep behaving.
-dpkg --install /root/openvswitch-datapath-dkms* && \
-dpkg --install /root/openvswitch-{common,switch}*
+dpkg --install /root/openvswitch-datapath-dkms* /root/openvswitch-common* /root/openvswitch-switch*
# add user jenkins to docker group
/usr/sbin/usermod -a -G docker jenkins
# add user jenkins to docker group
/usr/sbin/usermod -a -G docker jenkins