Skip to content

Commit 92e91ae

Browse files
author
Tim Pouyer
committed
Make sure java does not get removed by the clean.sh script
1 parent 7f22102 commit 92e91ae

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

scripts/stackinabox/init.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,18 @@ sudo update-rc.d devstack start 98 2 3 4 5 . stop 02 0 1 6 .
238238
# wait for openstack to startup
239239
sleep 60
240240

241+
# clean up after ourselves
242+
/vagrant/scripts/minimize/clean.sh
243+
241244
# install java (for use with udclient)
245+
sudo apt-get update
242246
sudo apt-get install -qqy default-jre
243247
sudo touch /etc/profile.d/java_home.sh
244248
sudo bash -c 'cat >> /etc/profile.d/java_home.sh' <<'EOF'
245249
export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/jre
246250
EOF
247251
sudo chmod 755 /etc/profile.d/java_home.sh
248252

249-
# clean up after ourselves
250-
/vagrant/scripts/minimize/clean.sh
251-
252253
sudo btrfs quota enable /var/lib/lxd
253254

254255
# restart

0 commit comments

Comments
 (0)