diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php index bde11c7c7..5f668838c 100644 --- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php +++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php @@ -255,7 +255,7 @@ if (isset($_POST['updatevm'])) { $xml = str_replace($olduuid,$newuuid,$xml); } else { // form view - if ($error = create_vdisk($_POST) === false) { + if (($error = create_vdisk($_POST)) === false) { $arrExistingConfig = custom::createArray('domain',$strXML); $arrUpdatedConfig = custom::createArray('domain',$lv->config_to_xml($_POST)); if ($debug) { @@ -2484,6 +2484,13 @@ $(function() { }); + $("#vmform #domain_machine").change(function changeMachineEvent(){ + // Cdrom Bus: select IDE for i440 and SATA for q35 + if ($(this).val().indexOf('q35') != -1) { + $('#vmform .cdrom_bus').val('sata'); + } + }); + $("#vmform .domain_vcpu").change(function changeVCPUEvent(){ var $cores = $("#vmform .domain_vcpu:checked"); if ($cores.length < 1) { diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page index 88df03ea2..9cb8bc83a 100755 --- a/emhttp/plugins/dynamix/DeviceInfo.page +++ b/emhttp/plugins/dynamix/DeviceInfo.page @@ -346,7 +346,7 @@ function selectDiskFsWidthZFS(slots,init) { })); } } - selected_width = slots; + if (selected_width == 0) selected_width = width; } $('#diskFsWidth').val(selected_width); } diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker index d5ba3bf29..90cec4c68 100755 --- a/etc/rc.d/rc.docker +++ b/etc/rc.d/rc.docker @@ -243,6 +243,8 @@ container_add_route(){ docker_network_start(){ log "Starting network..." + # ensure br_netfilter modules is loaded, re: https://github.com/moby/moby/issues/48948 + modprobe br_netfilter # create list of possible custom networks EXCLUDE=; INCLUDE=$(ls --indicator-style=none $SYSTEM | awk '/^br[0-9]+/' ORS=' ') while IFS=$'\n' read -r NETWORK; do