apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 20:29:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.11'

Browse Source
This commit is contained in:
Rohit Yadav 2018-09-07 16:15:52 +05:30
commit 82fc9f3016
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
systemvm/debian/opt/cloud/bin/setup/cloud-early-config
View File

@ -35,14 +35,8 @@ log_it() {
}
hypervisor() {
local try=$([ -x /usr/sbin/virt-what ] && virt-what | tail -1)
[ "$try" != "" ] && echo $try && return 0
grep -q QEMU /proc/cpuinfo && echo "kvm" && return 0
grep -q QEMU /var/log/messages && echo "kvm" && return 0
[ -d /proc/xen ] && mount -t xenfs none /proc/xen
if [ -d /proc/xen ]; then
mount -t xenfs none /proc/xen
$(dmesg | grep -q "Xen HVM")
if [ $? -eq 0 ]; then # 1=PV,0=HVM
echo "xen-hvm" && return 0
@ -51,6 +45,19 @@ hypervisor() {
fi
fi
[ -x /usr/sbin/virt-what ] && local facts=( $(virt-what) )
if [ "$facts" != "" ]; then
# Xen HVM is recognized as Hyperv when Viridian extensions are enabled
if [ "${facts[-1]}" == "xen-domU" ] && [ "${facts[0]}" == "hyperv" ]; then
echo "xen-hvm" && return 0
else
echo ${facts[-1]} && return 0
fi
fi
grep -q QEMU /proc/cpuinfo && echo "kvm" && return 0
grep -q QEMU /var/log/messages && echo "kvm" && return 0
vmware-checkvm &> /dev/null && echo "vmware" && return 0
echo "unknown" && return 1

30
ui/index.html
View File

@ -1583,7 +1583,7 @@
<div class="field maxsnaps">
<div class="name"><translate key="label.keep" /></div>
<div class="value">
<input type="text" name="maxsnaps" class="required" />
<input type="text" name="maxsnaps" class="required" maxlength="9"/>
<label for="maxsnaps"><translate key="label.snapshots" /></label>
</div>
</div>
@ -1686,34 +1686,34 @@
<tbody>
<!-- Hourly -->
<tr class="hourly">
<td class="time"><translate key="label.time.colon" /> <span></span> <translate key="label.min.past.the.hr" /></td>
<td class="time"><translate key="label.time.colon"></translate> <span></span> <translate key="label.min.past.the.hr"></translate></td>
<td class="day-of-week"><span></span></td>
<td class="timezone"><translate key="label.timezone.colon" /><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon" /> <span></span></td>
<td class="timezone"><translate key="label.timezone.colon"></translate><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon"></translate> <span></span></td>
<td class="actions"><div class="action destroy"><span class="icon">&nbsp;</span></div></td>
</tr>
<!-- Daily -->
<tr class="daily">
<td class="time"><translate key="label.time.colon" /> <span></span></td>
<td class="time"><translate key="label.time.colon"></translate> <span></span></td>
<td class="day-of-week"><span></span></td>
<td class="timezone"><translate key="label.timezone.colon" /><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon" /> <span></span></td>
<td class="timezone"><translate key="label.timezone.colon"></translate><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon"></translate> <span></span></td>
<td class="actions"><div class="action destroy"><span class="icon">&nbsp;</span></div></td>
</tr>
<!-- Weekly -->
<tr class="weekly">
<td class="time"><translate key="label.time.colon" /> <span></span></td>
<td class="day-of-week"><translate key="label.every" /> <span></span></td>
<td class="timezone"><translate key="label.timezone.colon" /><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon" /> <span></span></td>
<td class="time"><translate key="label.time.colon"></translate> <span></span></td>
<td class="day-of-week"><translate key="label.every"></translate> <span></span></td>
<td class="timezone"><translate key="label.timezone.colon"></translate><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon"></translate> <span></span></td>
<td class="actions"><div class="action destroy"><span class="icon">&nbsp;</span></div></td>
</tr>
<!-- Monthly -->
<tr class="monthly">
<td class="time"><translate key="label.time.colon" /> <span></span></td>
<td class="day-of-week"><translate key="label.day" /> <span></span> <translate key="label.of.month" /></td>
<td class="timezone"><translate key="label.timezone.colon" /><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon" /> <span></span></td>
<td class="time"><translate key="label.time.colon"></translate> <span></span></td>
<td class="day-of-week"><translate key="label.day"></translate> <span></span> <translate key="label.of.month"></translate></td>
<td class="timezone"><translate key="label.timezone.colon"></translate><br/><span></span></td>
<td class="keep"><translate key="label.keep.colon"></translate> <span></span></td>
<td class="actions"><div class="action destroy"><span class="icon">&nbsp;</span></div></td>
</tr>
</tbody>