Skip to content

Commit

Permalink
Fix some branding issues
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <[email protected]>
  • Loading branch information
stgraber committed May 31, 2024
1 parent de32745 commit 78affff
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bin/update-images
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ while :; do
sleep 1
done

# Make sure LXD is functional
# Make sure Incus is functional
incus delete update-images -f >/dev/null 2>&1 || true
incus init update-images --empty --quiet
incus delete -f update-images
Expand Down
2 changes: 1 addition & 1 deletion images/centos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ files:
generator: dump
content: |-
[Unit]
Description=LXD - agent (centos workaround)
Description=Incus - agent (centos workaround)
Before=incus-agent.service
[Service]
Expand Down
2 changes: 1 addition & 1 deletion images/funtoo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ actions:
- trigger: post-packages
action: |-
#!/bin/bash
# Configure LXD/LXC tty
# Configure tty
sed -e 's|^#x1|x1|g' -e '/^c[0-9].*/d' -i /etc/inittab
Expand Down
2 changes: 1 addition & 1 deletion images/nixos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ packages:

files:
- name: conf-hostname
path: /etc/nixos/lxd.nix
path: /etc/nixos/incus.nix

This comment has been minimized.

Copy link
@srd424

srd424 Jun 1, 2024

Contributor

This seems to have broken something - I've just based on a container on the latest 23.11 image, and the /etc/nixos/configuration.nix still tries to import lxd.nix, which is obviously now not there under that name. I'm not sure where it's generated?

This comment has been minimized.

Copy link
@srd424

srd424 Jun 1, 2024

Contributor

Oh, it's upstream: https://github.com/NixOS/nixpkgs/blob/77c97942c072a6d9ed5fc7790b607b3cfad6784b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix#L11 :(

Perhaps this one change could be reverted for now? I don't know if it's possible/easy for upstream to detect it's running in incus as opposed to lxd.

This comment has been minimized.

Copy link
@stgraber

stgraber Jun 2, 2024

Author Member

Reverted for now.

@adamcstephens is this something that can easily be handled upstream so we can de-LXD-ify things further?

This comment has been minimized.

Copy link
@adamcstephens

adamcstephens Jun 2, 2024

Contributor

It won’t happen quickly, and we just released 24.05 which probably won’t be changed. I'll look into this for unstable and then when 24.11 is released it'll be gone.

This comment has been minimized.

Copy link
@stgraber

stgraber Jun 2, 2024

Author Member

Sounds good

generator: template
content: |-
{ lib, config, pkgs, ... }:
Expand Down
2 changes: 1 addition & 1 deletion images/openeuler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ files:
generator: dump
content: |-
[Unit]
Description=LXD - agent (openEuler workaround)
Description=Incus - agent (openEuler workaround)
Before=incus-agent.service
[Service]
Expand Down
2 changes: 1 addition & 1 deletion images/springdalelinux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ files:
generator: dump
content: |-
[Unit]
Description=LXD - agent (centos workaround)
Description=Incus - agent (springdale workaround)
Before=incus-agent.service
[Service]
Expand Down
2 changes: 1 addition & 1 deletion images/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ actions:
# Automatic disk resize
cat << EOF > /etc/systemd/system/incus-growpart.service
[Unit]
Description=LXD - grow root partition
Description=Incus - grow root partition
[Service]
Type=oneshot
Expand Down

0 comments on commit 78affff

Please sign in to comment.