Merge pull request #44 from stgraber/main

Remove some mentions of Canonical

CODE_OF_CONDUCT.md

@@ -52,7 +52,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Makefile

@@ -60,7 +60,7 @@ incus-doc:
 .PHONY: deps
 deps:
 	@if [ ! -e "$(RAFT_PATH)" ]; then \
-		git clone --depth=1 "https://github.com/canonical/raft" "$(RAFT_PATH)"; \
+		git clone --depth=1 "https://github.com/cowsql/raft" "$(RAFT_PATH)"; \
 	elif [ -e "$(RAFT_PATH)/.git" ]; then \
 		cd "$(RAFT_PATH)"; git pull; \
 	fi
@@ -213,7 +213,7 @@ dist: doc
 	git clone --depth=1 https://github.com/cowsql/cowsql $(TMP)/incus-$(VERSION)/vendor/cowsql
 	(cd $(TMP)/incus-$(VERSION)/vendor/cowsql ; git show-ref HEAD | cut -d' ' -f1 > .gitref)
 
-	git clone --depth=1 https://github.com/canonical/raft $(TMP)/incus-$(VERSION)/vendor/raft
+	git clone --depth=1 https://github.com/cowsql/raft $(TMP)/incus-$(VERSION)/vendor/raft
 	(cd $(TMP)/incus-$(VERSION)/vendor/raft ; git show-ref HEAD | cut -d' ' -f1 > .gitref)
 
 	# Copy doc output
@@ -246,7 +246,7 @@ update-pot:
 ifeq "$(INCUS_OFFLINE)" ""
 	(cd / ; $(GO) install -v -x github.com/snapcore/snapd/i18n/[email protected])
 endif
-	xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) --msgid-bugs-address=lxc-users@lists.linuxcontainers.org --keyword=i18n.G --keyword-plural=i18n.NG cmd/incus/*.go internal/cliconfig/*.go
+	xgettext-go -o po/$(DOMAIN).pot --add-comments-tag=TRANSLATORS: --sort-output --package-name=$(DOMAIN) --msgid-bugs-address=lxc-devel@lists.linuxcontainers.org --keyword=i18n.G --keyword-plural=i18n.NG cmd/incus/*.go internal/cliconfig/*.go
 
 .PHONY: build-mo
 build-mo: $(MOFILES)

doc/rest-api.yaml

@@ -6142,21 +6142,21 @@ definitions:
         x-go-package: github.com/lxc/incus/shared/api
 info:
     contact:
-        email: lxd@lists.canonical.com
-        name: LXD upstream
+        email: lxc-devel@lists.linuxcontainers.org
+        name: Incus upstream
         url: https://github.com/lxc/incus
     description: |-
-        This is the REST API used by all LXD clients.
+        This is the REST API used by all Incus clients.
         Internal endpoints aren't included in this documentation.
 
-        The LXD API is available over both a local unix+http and remote https API.
+        The Incus API is available over both a local unix+http and remote https API.
         Authentication for local users relies on group membership and access to the unix socket.
         For remote users, the default authentication method is TLS client
         certificates.
     license:
         name: Apache-2.0
         url: https://www.apache.org/licenses/LICENSE-2.0
-    title: LXD external REST API
+    title: Incus external REST API
     version: "1.0"
 paths:
     /:

incusd/instance/drivers/driver_qemu.go

@@ -1466,7 +1466,7 @@ func (d *qemu) start(stateful bool, op *operationlock.InstanceOperation) error {
 
 	// SMBIOS only on x86_64 and aarch64.
 	if d.architectureSupportsUEFI(d.architecture) {
-		qemuCmd = append(qemuCmd, "-smbios", "type=2,manufacturer=Canonical Ltd.,product=LXD")
+		qemuCmd = append(qemuCmd, "-smbios", "type=2,manufacturer=LinuxContainers,product=Incus")
 	}
 
 	// Attempt to drop privileges (doesn't work when restoring state).

incusd/swagger.go

@@ -1,16 +1,16 @@
-// LXD external REST API
+// Incus external REST API
 //
-// This is the REST API used by all LXD clients.
+// This is the REST API used by all Incus clients.
 // Internal endpoints aren't included in this documentation.
 //
-// The LXD API is available over both a local unix+http and remote https API.
+// The Incus API is available over both a local unix+http and remote https API.
 // Authentication for local users relies on group membership and access to the unix socket.
 // For remote users, the default authentication method is TLS client
 // certificates.
 //
 //	Version: 1.0
 //	License: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0
-//	Contact: LXD upstream <lxd@lists.canonical.com> https://github.com/lxc/incus
+//	Contact: Incus upstream <lxc-devel@lists.linuxcontainers.org> https://github.com/lxc/incus
 //
 // swagger:meta
 package main

po/ber.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:10+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Berber <https://hosted.weblate.org/projects/linux-containers/"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/bg.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:09+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/linux-"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/ca.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:10+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/linux-containers/"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/cs.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:11+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/linux-containers/"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/de.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:06+0000\n"
 "Last-Translator: Krombel <[email protected]>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/linux-containers/"
@@ -3202,7 +3202,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 #, fuzzy
 msgid "Invalid number of arguments"
 msgstr "ungültiges Argument %s"

po/el.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:06+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/linux-containers/"
@@ -2827,7 +2827,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/eo.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:11+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/linux-"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/es.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2023-06-16 20:55+0000\n"
 "Last-Translator: Francisco Serrador <[email protected]>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/linux-containers/"
@@ -3095,7 +3095,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/fa.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:09+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/linux-containers/"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/fi.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:08+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/linux-containers/"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/fr.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: LXD\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:06+0000\n"
 "Last-Translator: Wivik <[email protected]>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/linux-containers/"
@@ -3245,7 +3245,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 #, fuzzy
 msgid "Invalid number of arguments"
 msgstr "nombre d'arguments incorrect pour la sous-comande"

po/he.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:11+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/linux-containers/"
@@ -2795,7 +2795,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/hi.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:08+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/linux-containers/"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/id.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lxd\n"
-"Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-"POT-Creation-Date: 2023-08-12 21:30+0200\n"
+"Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+"POT-Creation-Date: 2023-08-16 00:09-0400\n"
 "PO-Revision-Date: 2022-03-10 15:07+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/linux-"
@@ -2794,7 +2794,7 @@ msgstr ""
 msgid "Invalid new snapshot name, parent volume must be the same as source"
 msgstr ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid "Invalid number of arguments"
 msgstr ""
 

po/incus.pot

@@ -6,8 +6,8 @@
 #, fuzzy
 msgid   ""
 msgstr  "Project-Id-Version: incus\n"
-        "Report-Msgid-Bugs-To: lxc-users@lists.linuxcontainers.org\n"
-        "POT-Creation-Date: 2023-08-12 21:30+0200\n"
+        "Report-Msgid-Bugs-To: lxc-devel@lists.linuxcontainers.org\n"
+        "POT-Creation-Date: 2023-08-16 00:09-0400\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2498,7 +2498,7 @@ msgstr  ""
 msgid   "Invalid new snapshot name, parent volume must be the same as source"
 msgstr  ""
 
-#: cmd/incus/main.go:484
+#: cmd/incus/main.go:482
 msgid   "Invalid number of arguments"
 msgstr  ""