Skip to content

Commit

Permalink
Drop usage of virtinterfaced
Browse files Browse the repository at this point in the history
Nothing uses this any more.

`HostVmsList` already didn't expect an `interfaces` property any more,
so drop specifying it.

Fixes #1777
  • Loading branch information
martinpitt committed Aug 26, 2024
1 parent 28e2e32 commit 3f9521f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 84 deletions.
1 change: 0 additions & 1 deletion packaging/cockpit-machines.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ Requires: libvirt-daemon-driver-qemu
Requires: libvirt-daemon-driver-network
Requires: libvirt-daemon-driver-nodedev
Requires: libvirt-daemon-driver-storage-core
Requires: (libvirt-daemon-driver-interface if virt-install)
Requires: (libvirt-daemon-config-network if virt-install)
Recommends: libvirt-daemon-driver-storage-disk
%if 0%{?rhel}
Expand Down
3 changes: 1 addition & 2 deletions src/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class AppActive extends React.Component {
}

render() {
const { vms, config, storagePools, systemInfo, ui, networks, nodeDevices, interfaces } = store.getState();
const { vms, config, storagePools, systemInfo, ui, networks, nodeDevices } = store.getState();
const { path, cloudInitSupported, downloadOSSupported, unattendedSupported, unattendedUserLogin, virtInstallAvailable } = this.state;
const combinedVms = [...vms, ...dummyVmsFilter(vms, ui.vms)];
const properties = {
Expand Down Expand Up @@ -337,7 +337,6 @@ class AppActive extends React.Component {
ui={ui}
libvirtVersion={systemInfo.libvirtVersion}
storagePools={storagePools}
interfaces={interfaces}
networks={networks}
actions={vmActions}
resourceHasError={this.state.resourceHasError}
Expand Down
75 changes: 0 additions & 75 deletions src/libvirtApi/interface.js

This file was deleted.

1 change: 0 additions & 1 deletion test/browser/browser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ sh -x test/vm.install

if [ "${PLATFORM_ID:-}" != "platform:el8" ]; then
# https://gitlab.com/libvirt/libvirt/-/issues/219
systemctl start virtinterfaced.socket
systemctl start virtnetworkd.socket
systemctl start virtnodedevd.socket
systemctl start virtstoraged.socket
Expand Down
5 changes: 0 additions & 5 deletions test/vm.install
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ if grep -q 'ID=debian' /usr/lib/os-release; then
echo '* soft core unlimited' >> /etc/security/limits.conf
fi

if grep -q 'ID="opensuse' /usr/lib/os-release; then
# Make sure virtinterfaced.socket is enabled
systemctl enable --now virtinterfaced.socket
fi

systemctl enable cockpit.socket

# don't force https:// (self-signed cert)
Expand Down

0 comments on commit 3f9521f

Please sign in to comment.