Remove references to LXD

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>

diff --git a/README.md b/README.md
index 5ce42c87f749d9c61ddc475a96d8c80fef10ed50..4ddb1c5cd5b01754a427e6301a2efdad5175041f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![LXD](https://linuxcontainers.org/static/img/containers.png)](https://linuxcontainers.org/lxd)
+![Linux Containers logo](https://linuxcontainers.org/static/img/containers.png)
 # LXC
 
 LXC is the well-known and heavily tested low-level Linux container runtime. It
@@ -94,7 +94,7 @@ configuration keys such as `lxc.net.0` expose various subkeys such as
 `lxc.net.0.type`, `lxc.net.0.link`, `lxc.net.0.ipv6.address`, and others for
 even more fine-grained configuration.
 
-LXC is used as the default runtime for [LXD](https://github.com/lxc/lxd),
+LXC is used as the default runtime for [Incus](https://github.com/lxc/incus),
 a container hypervisor exposing a well-designed and stable REST-api on top of
 it.
 

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index a9e0c91ce445866397cbb6d1a785ca7189ff59e2..23e92d6aa6b31e58682dd1ac556d22040b05f910 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -3028,7 +3028,7 @@ __cgfsng_ops static bool cgfsng_attach(struct cgroup_ops *ops,
                         * controller after the container has started and so
                         * the container doesn't make use of this controller.
                         *
-                        * Link: https://github.com/lxc/lxd/issues/8577
+                        * Link: https://github.com/canonical/lxd/issues/8577
                         */
                        TRACE("Skipping unused %s controller", maybe_empty(h->controllers[0]));
                        continue;

diff --git a/src/lxc/cmd/lxc-update-config.in b/src/lxc/cmd/lxc-update-config.in
index 0a03f06d0b685593f101e2a23f12b0f74dc73b5d..d9659d1b537d2e77a2e03075fbe68d3217bc1650 100755 (executable)
--- a/src/lxc/cmd/lxc-update-config.in
+++ b/src/lxc/cmd/lxc-update-config.in
@@ -91,12 +91,12 @@ sed -i \
 #
 # lxc.network.type = veth
 # lxc.network.flags = up
-# lxc.network.link = lxdbr0
+# lxc.network.link = lxcbr0
 # lxc.network.name= eth0
 #
 # lxc.network.type = veth
 # lxc.network.flags = up
-# lxc.network.link = lxdbr0
+# lxc.network.link = lxcbr0
 # lxc.network.name = eth1
 
 set +e

diff --git a/src/lxc/log.c b/src/lxc/log.c
index cdd11ff1c084c0cad8bb7f15b702092d0cf38c86..206f0227f5812ef80ee10f6f3234411b07b57e2b 100644 (file)
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -304,9 +304,9 @@ static int lxc_unix_epoch_to_utc(char *buf, size_t bufsize, const struct timespe
  * all fiddle with global variables and locking in various libcs. They cause
  * deadlocks when liblxc is used multi-threaded and no matter how smart you
  * think you are, you __will__ cause trouble using them.
- * (As a short example how this can cause trouble: LXD uses forkstart to fork
+ * (As a short example how this can cause trouble: Incus uses forkstart to fork
  * off a new process that runs the container. At the same time the go runtime
- * LXD relies on does its own multi-threading thing which we can't control. The
+ * Incus relies on does its own multi-threading thing which we can't control. The
  * fork()ing + threading then seems to mess with the locking states in these
  * time functions causing deadlocks.)
  * The current solution is to be good old unix people and use the Epoch as our

diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
index 5cc7d269cbc98d748c0b01d979e318ff036d1527..6f0b10dfe7f30f5290791ac929a90a10545f0729 100644 (file)
--- a/src/lxc/lsm/apparmor.c
+++ b/src/lxc/lsm/apparmor.c
@@ -329,10 +329,10 @@ static const char AA_PROFILE_NESTING_BASE[] =
 "  mount fstype=proc -> /usr/lib/*/lxc/**,\n"
 "  mount fstype=sysfs -> /usr/lib/*/lxc/**,\n"
 "\n"
-"  # Allow nested LXD\n"
-"  mount none -> /var/lib/lxd/shmounts/,\n"
-"  mount /var/lib/lxd/shmounts/ -> /var/lib/lxd/shmounts/,\n"
-"  mount options=bind /var/lib/lxd/shmounts/** -> /var/lib/lxd/**,\n"
+"  # Allow nested Incus\n"
+"  mount none -> /var/lib/incus/shmounts/,\n"
+"  mount /var/lib/incus/shmounts/ -> /var/lib/incus/shmounts/,\n"
+"  mount options=bind /var/lib/incus/shmounts/** -> /var/lib/incus/**,\n"
 "\n"
 "  # TODO: There doesn't seem to be a way to ask for:\n"
 "  # mount options=(ro,nosuid,nodev,noexec,remount,bind),\n"

diff --git a/src/lxc/network.c b/src/lxc/network.c
index e1ee57e545333edbd71fab29e334a43fdefaff53..3fa0bb457e875ac67913ef80a0b39f9d770cfcfd 100644 (file)
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -3478,7 +3478,7 @@ static int lxc_create_network_priv(struct lxc_handler *handler)
  * based on those random devices names to the target name.
  *
  * Note that the transient name is based on the type of network device as
- * specified in the LXC config. However, that doesn't mean it's correct. LXD
+ * specified in the LXC config. However, that doesn't mean it's correct. Incus
  * passes veth devices and a range of other network devices (e.g. Infiniband
  * VFs etc.) via LXC_NET_PHYS even though they're not really "physical" in the
  * sense we like to think about it so you might see a veth device being
@@ -3663,7 +3663,7 @@ static bool lxc_delete_network_priv(struct lxc_handler *handler)
                        goto clear_ifindices;
 
                /* Explicitly delete host veth device to prevent lingering
-                * devices. We had issues in LXD around this.
+                * devices. We had issues in Incus around this.
                 */
                if (!is_empty_string(netdev->priv.veth_attr.pair))
                        hostveth = netdev->priv.veth_attr.pair;

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 9f68304bfbefe33e5859e6d395afc19f9b76139a..e1dff590fc0da72c83358b67b9484caf9d1a85e7 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1093,7 +1093,7 @@ static int do_start(void *data)
                goto out_warn_father;
 
        /* Unshare CLONE_NEWNET after CLONE_NEWUSER. See
-        * https://github.com/lxc/lxd/issues/1978.
+        * https://github.com/canonical/lxd/issues/1978.
         */
        if (handler->ns_unshare_flags & CLONE_NEWNET) {
                ret = unshare(CLONE_NEWNET);

diff --git a/src/tests/parse_config_file.c b/src/tests/parse_config_file.c
index ac4a9419b782ce0e4dfe75a2aaced591a0e3e3e4..d0a285c1dd4ad9aa365be3dc6d8e7eb2149d4173 100644 (file)
--- a/src/tests/parse_config_file.c
+++ b/src/tests/parse_config_file.c
@@ -884,7 +884,7 @@ int main(int argc, char *argv[])
                goto non_test_error;
        }
 
-       if (set_get_compare_clear_save_load(c, "lxc.cgroup.dir", "lxd", tmpf, true)) {
+       if (set_get_compare_clear_save_load(c, "lxc.cgroup.dir", "incus", tmpf, true)) {
                lxc_error("%s\n", "lxc.cgroup.dir");
                goto non_test_error;
        }