Skip to content

Commit 0aa8c2a

Browse files
authored
Merge branch 'lxc:main' into main
2 parents 1746d26 + f9d5bb5 commit 0aa8c2a

File tree

99 files changed

+1089
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1089
-170
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ jobs:
140140
- lvm
141141
- zfs
142142
- ceph
143+
- linstor
143144
- random
144145
os:
145146
- ubuntu-24.04

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ endif
101101

102102
.PHONY: update-ovsdb
103103
update-ovsdb:
104-
go install github.com/ovn-org/libovsdb/cmd/modelgen@main
104+
go install github.com/ovn-kubernetes/libovsdb/cmd/modelgen@main
105105

106106
rm -Rf internal/server/network/ovs/schema
107107
mkdir internal/server/network/ovs/schema

cmd/incus-agent/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,6 @@ func eventsProcess(event api.Event) {
161161
logger.Infof("Mounted hotplug %q (Type: %q) to %q", mntSource, "virtiofs", e.Config["path"])
162162
} else if e.Action == "removed" {
163163
// Attempt to unmount the disk.
164-
_ = osUmount(mntSource)
164+
_ = osUmount(mntSource, e.Config["path"], "virtiofs")
165165
}
166166
}

0 commit comments

Comments
 (0)