diff --git a/docs/en-US/linux-installation.xml b/docs/en-US/linux-installation.xml
index b560ee0d5bd..14a2f51b3d2 100644
--- a/docs/en-US/linux-installation.xml
+++ b/docs/en-US/linux-installation.xml
@@ -22,32 +22,49 @@
under the License.
-->
- Linux OS Installation
- Use the following steps to begin the Linux OS installation:
-
- Download the script file cloud-set-guest-password:
-
- Linux:
-
- Windows:
-
-
-
- Copy this file to /etc/init.d.On some Linux distributions, copy the file to /etc/rc.d/init.d.
-
- Run the following command to make the script executable:chmod +x /etc/init.d/cloud-set-guest-password
-
- Depending on the Linux distribution, continue with the appropriate step.On Fedora, CentOS/RHEL, and Debian, run:chkconfig --add cloud-set-guest-password
- On Ubuntu with VMware tools, link the script file to the /etc/network/if-up and
- /etc/network/if-down folders, and run the script:
- #ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password
+ Linux OS Installation
+ Use the following steps to begin the Linux OS installation:
+
+
+ Download the script file cloud-set-guest-password:
+
+
+ Linux:
+
+
+
+ Windows:
+
+
+
+
+
+ Copy this file to /etc/init.d.
+ On some Linux distributions, copy the file to
+ /etc/rc.d/init.d.
+
+
+ Run the following command to make the script executable:
+ chmod +x /etc/init.d/cloud-set-guest-password
+
+
+ Depending on the Linux distribution, continue with the appropriate step.
+ On Fedora, CentOS/RHEL, and Debian, run:
+ chkconfig --add cloud-set-guest-password
+ On Ubuntu with VMware tools, link the script file to the
+ /etc/network/if-up and /etc/network/if-down
+ folders, and run the script:
+ #ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password
#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-down/cloud-set-guest-password
- If you are using Ubuntu 11.04, start by creating a directory called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version of Ubuntu). On all Ubuntu versions: Run “sudo update-rc.d cloud-set-guest-password defaults 98”. To test, run "mkpasswd" and check that it is generating a new password. If the “mkpasswd” command does not exist, run "sudo apt-get install whois" (or sudo apt-get install mkpasswd, depending on your Ubuntu version) and repeat.
-
-
-
-
+ If you are using Ubuntu 11.04, start by creating a directory
+ called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version
+ of Ubuntu). On all Ubuntu versions: Run “sudo update-rc.d cloud-set-guest-password defaults
+ 98”. To test, run "mkpasswd" and check that it is generating a new password. If the
+ “mkpasswd” command does not exist, run "sudo apt-get install whois" (or sudo apt-get install
+ mkpasswd, depending on your Ubuntu version) and repeat.
+
+
+
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 736234c724e..5aa96218a06 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -724,6 +724,15 @@ setup_dnsmasq() {
then
echo "$ETH0_IP6 data-server" >> /etc/hosts
fi
+#add the dhcp-client-update only if dnsmasq version is 2.6 and above
+ dnsmasqVersion=$(dnsmasq -v | grep version -m 1 | grep -o "[[:digit:]]\.[[:digit:]]")
+ major=$(echo "$dnsmasqVersion" | cut -d '.' -f 1)
+ minor=$(echo "$dnsmasqVersion" | cut -d '.' -f 2)
+ if [ "$major" -eq '2' -a "$minor" -ge '6' ] || [ "$major" -gt '2' ]
+ then
+ sed -i -e "/^dhcp-client-update/d" /etc/dnsmasq.conf
+ echo 'dhcp-client-update' >> /etc/dnsmasq.conf
+ fi
}
setup_sshd(){
diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
index bcd4200b471..f6bd2b651ba 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -427,6 +427,8 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage
throw new CloudRuntimeException("Unable to configure simulator because of " + ex.getMessage(), ex);
} finally {
txn.close();
+ txn = Transaction.open(Transaction.CLOUD_DB);
+ txn.close();
}
return true;
}