vm build cleanup

This commit is contained in:
j 2015-05-15 13:42:32 +02:00
parent 6dd9522cc5
commit 0a03240033

View file

@ -42,6 +42,7 @@ apt-get install -y \
fi fi
apt-get install -y \ apt-get install -y \
sudo \
openssh-server \ openssh-server \
vim \ vim \
wget \ wget \
@ -50,8 +51,6 @@ apt-get install -y \
rabbitmq-server \ rabbitmq-server \
bzr \ bzr \
git \ git \
subversion \
mercurial \
python-setuptools \ python-setuptools \
python-pip \ python-pip \
python-virtualenv \ python-virtualenv \
@ -171,11 +170,15 @@ if [ "$LXC" == "yes" ]; then
fi fi
if [ "$LXC" == "no" ]; then if [ "$LXC" == "no" ]; then
if [ "$SYSTEMD" == "yes" ]; then
echo Servers=pool.ntp.org >> /etc/systemd/timesyncd.conf
else
cat > /etc/cron.d/ntp_fixtime <<EOF cat > /etc/cron.d/ntp_fixtime <<EOF
# /etc/cron.d/ntp_fixtime: vms can go out of sync, run ntpdate to sync time # /etc/cron.d/ntp_fixtime: vms can go out of sync, run ntpdate to sync time
*/10 * * * * root /usr/sbin/ntpdate pool.ntp.org >/dev/null */10 * * * * root /usr/sbin/ntpdate pool.ntp.org >/dev/null
EOF EOF
fi
cat > /usr/local/bin/genissue <<EOF cat > /usr/local/bin/genissue <<EOF
#!/bin/sh #!/bin/sh