Merge fixes from 1.1-stable

This commit is contained in:
Matt Churchyard
2017-03-10 10:55:32 +00:00
parent bb891b12f9
commit 8384a1b813
3 changed files with 4 additions and 2 deletions

View File

@@ -395,6 +395,6 @@ info::__bytes_human(){
5) _ext="T" ;;
esac
export LC_NUMERIC="C"
export LC_ALL="C"
printf "%.3f%s" "${_val}" "${_ext}"
}

View File

@@ -36,7 +36,7 @@ switch::standard::init(){
switch::standard::id "_id" "${_name}" && return 0
# create a bridge for this switch
_id=$(ifconfig bridge create description "vm-${_name}" up 2>/dev/null)
_id=$(ifconfig bridge create description "vm-${_name}" priority 0 up 2>/dev/null)
[ $? -ne 0 ] && util::err "failed to create bridge interface for switch ${_name}"
# try to set ip address

View File

@@ -5,3 +5,5 @@ network0_type="virtio-net"
network0_switch="public"
disk0_type="ahci-hd"
disk0_name="disk0.img"
grub_run_partition="1"
grub_run_dir="/boot/grub"