commit 2ebcd3817f6b9f18ddb408026ac07f48d0bea801
author Jenkins <jenkins@review.openstack.org> Tue Jul 22 00:42:47 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jul 22 00:42:47 2014 +0000
tree e8310a55750cce5a0162578fc4bbcf755862afdd
parent 01450acf551581405e620a326d47b03df3963654
parent 105eaee2c0f9aedeb75807728beb25e27aea78df

Merge "XenAPI: Use GUEST_PASSWORD when installing DomU"

tools/xen/install_os_domU.sh

diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index e879bc2..12e861e 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -207,6 +207,8 @@
             -e "s,\(d-i mirror/http/hostname string\).*,\1 $UBUNTU_INST_HTTP_HOSTNAME,g" \
             -e "s,\(d-i mirror/http/directory string\).*,\1 $UBUNTU_INST_HTTP_DIRECTORY,g" \
             -e "s,\(d-i mirror/http/proxy string\).*,\1 $UBUNTU_INST_HTTP_PROXY,g" \
+            -e "s,\(d-i passwd/root-password password\).*,\1 $GUEST_PASSWORD,g" \
+            -e "s,\(d-i passwd/root-password-again password\).*,\1 $GUEST_PASSWORD,g" \
             -i "${HTTP_SERVER_LOCATION}/devstackubuntupreseed.cfg"
     fi