From 5159cbec9f7eb3000cde1cb9479a52ec0ee82b4a Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 3 Feb 2015 16:50:37 +0530 Subject: [PATCH] appliance: get scripts only from 4.5 and not master Signed-off-by: Rohit Yadav --- tools/appliance/definitions/systemvm64template/postinstall.sh | 4 ++-- tools/appliance/definitions/systemvmtemplate/postinstall.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh index 134571c9662..a90b06c2e2c 100644 --- a/tools/appliance/definitions/systemvm64template/postinstall.sh +++ b/tools/appliance/definitions/systemvm64template/postinstall.sh @@ -242,11 +242,11 @@ configure_services() { mkdir -p /var/lib/haproxy # Get config files from master - snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=HEAD;sf=tgz" + snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;refs/heads/4.5;sf=tgz" snapshot_dir="/opt/cloudstack*" cd /opt wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz - tar -zxvf cloudstack.tar.gz --wildcards 'cloudstack-HEAD-???????/systemvm' + tar -zxvf cloudstack.tar.gz cp -rv $snapshot_dir/systemvm/patches/debian/config/* / cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* / mkdir -p /usr/share/cloud/ diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index eb4c5e53f28..927bbeacc14 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -232,11 +232,11 @@ configure_services() { mkdir -p /var/lib/haproxy # Get config files from master - snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=HEAD;sf=tgz" + snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=refs/heads/4.5;sf=tgz" snapshot_dir="/opt/cloudstack*" cd /opt wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz - tar -zxvf cloudstack.tar.gz --wildcards 'cloudstack-HEAD-???????/systemvm' + tar -zxvf cloudstack.tar.gz cp -rv $snapshot_dir/systemvm/patches/debian/config/* / cp -rv $snapshot_dir/systemvm/patches/debian/vpn/* / mkdir -p /usr/share/cloud/