Unverified Commit dc7db9bc authored by Fernando Rodrigues's avatar Fernando Rodrigues
Browse files

treewide: rename Xen to Xen Project 



Xen is a trademark of the Cloud Software Group; we're not packaging
Xen(Server), we're packaging the Xen Project Hypervisor, which is open
source and owned by the Linux Foundation.

This is based on advice from Kelly Choi, the Xen Project Community
Manager, who has assisted us in the branding aspects of pacakaging.

Signed-off-by: default avatarFernando Rodrigues <alpha@sigmasquadron.net>
parent 82f0ee2c

nixos/doc/manual/release-notes/rl-2411.section.md

+3 −3
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ 
- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html)

  was added through the `boot.initrd.systemd.dmVerity` option.



- The [Xen Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable).

- The [Xen Project Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable).

  - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems.

  ::: {.warning}

    Booting into Xen through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported.

    Booting into the Xen Project Hypervisor through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported.

  :::

  - There are two flavours of Xen available by default: `xen`, which includes all built-in components, and `xen-slim`, which replaces the built-in components with their Nixpkgs equivalents.

    - The `qemu-xen-traditional` component has been deprecated by upstream Xen, and is no longer available in any of the Xen packages.

    - The `qemu-xen-traditional` component has been deprecated by the upstream Xen Project, and is no longer available in any of the Xen Project Hypervisor packages.

  - The OCaml-based Xen Store can now be configured using  [`virtualisation.xen.store.settings`](#opt-virtualisation.xen.store.settings).

  - The `virtualisation.xen.bridge` options have been deprecated in this release cycle. Users who need network bridges are encouraged to set up their own networking configurations.

nixos/modules/virtualisation/xe-guest-utilities.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ let 
in {

  options = {

    services.xe-guest-utilities = {

      enable = lib.mkEnableOption "the Xen guest utilities daemon";

      enable = lib.mkEnableOption "the XenServer guest utilities daemon";

    };

  };

  config = lib.mkIf cfg.enable {

nixos/modules/virtualisation/xen-boot-builder.sh

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
[[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1

case "$1" in

    "quiet") true ;;

    "default" | "info") echo -n "Installing Xen Hypervisor boot entries..." ;;

    "default" | "info") echo -n "Installing Xen Project Hypervisor boot entries..." ;;

    "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m called with the '$1' flag" ;;

    *)

        echo -e "\e[1;31merror:\e[0m xenBootBuilder was called with an invalid argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option."
@@ -150,7 +150,7 @@ else 
    esac

    if [ "$1" = "info" ]; then

        if [[ ${#preGenerations[@]} == "${#postGenerations[@]}" ]]; then

            echo -e "\e[1;33mNo Change:\e[0m Xen Hypervisor boot entries were refreshed, but their contents are identical."

            echo -e "\e[1;33mNo Change:\e[0m Xen Project Hypervisor boot entries were refreshed, but their contents are identical."

        else

            echo -e "\e[1;32mSuccess:\e[0m Changed the following boot entries:"

            # We briefly unset errexit and pipefail here, as GNU diff has no option to not fail when files differ.

nixos/modules/virtualisation/xen-dom0.nix

+4 −4
Original line number Diff line number Diff line 
# Xen hypervisor (Dom0) support.

# Xen Project Hypervisor (Dom0) support.



{

  config,
@@ -123,7 +123,7 @@ in 


  options.virtualisation.xen = {



    enable = lib.options.mkEnableOption "the Xen Hypervisor, a virtualisation technology defined as a *type-1 hypervisor*, which allows multiple virtual machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the privileged *Domain 0*. This option requires a reboot into a Xen kernel to take effect";

    enable = lib.options.mkEnableOption "the Xen Project Hypervisor, a virtualisation technology defined as a *type-1 hypervisor*, which allows multiple virtual machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the privileged *Domain 0*. This option requires a reboot into a Xen kernel to take effect";



    debug = lib.options.mkEnableOption "Xen debug features for Domain 0. This option enables some hidden debugging tests and features, and should not be used in production";
@@ -141,7 +141,7 @@ in 
      defaultText = lib.options.literalExpression "pkgs.xen";

      example = lib.options.literalExpression "pkgs.xen-slim";

      description = ''

        The package used for Xen Hypervisor.

        The package used for Xen Project Hypervisor.

      '';

      relatedPackages = [

        "xen"
@@ -207,7 +207,7 @@ in 


          - `quiet` supresses all messages.



          - `default` adds a simple "Installing Xen Hypervisor boot entries...done." message to the script.

          - `default` adds a simple "Installing Xen Project Hypervisor boot entries...done." message to the script.



          - `info` is the same as `default`, but it also prints a diff with information on which generations were altered.

            - This option adds two extra dependencies to the script: `diffutils` and `bat`.

pkgs/applications/virtualization/xen/README.md

+3 −3
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
  </a>

</p>



# Xen Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a>

# Xen Project Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a>



This directory includes the build recipes for the [Xen Hypervisor](https://xenproject.org/).

This directory includes the build recipes for the [Xen Project Hypervisor](https://xenproject.org/).



Some other notable packages that compose the Xen Ecosystem include:

Some other notable packages that compose the Xen Project Ecosystem include:



- `ocamlPackages.xenstore`: Mirage's `oxenstore` implementation.

- `ocamlPackages.vchan`: Mirage's `xen-vchan` implementation.