diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-09 19:43:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-09 19:43:59 -0400 |
commit | 21b50e6f6879f22b9261362bfd6dce26b7611e18 (patch) | |
tree | 45b14a4aa78e9d1a726031dc282e93f0ef9fc28b | |
parent | 8583d99e429a99ded8c7e9433afc00cd37c27672 (diff) |
Revert "iso-image: normalize volumeID"
6 files changed, 3 insertions, 30 deletions
diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index d4633d2c8d169..b7b1ab52a6373 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -107,7 +107,6 @@ xorriso="xorriso -publisher nixos -graft-points -full-iso9660-filenames - -joliet ${isoBootFlags} ${usbBootFlags} ${efiBootFlags} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 9303e8fde13a8..24070a786945a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -18,6 +18,8 @@ with lib; # ISO naming. isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso"; + isoImage.volumeID = substring 0 11 "NIXOS_ISO"; + # EFI booting isoImage.makeEfiBootable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 84394a1ecae5b..62cbdbcfd17bb 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -7,8 +7,6 @@ with lib; { imports = [ ./installation-cd-graphical-base.nix ]; - isoImage.edition = "gnome"; - services.xserver.desktopManager.gnome3.enable = true; # Wayland can be problematic for some hardware like Nvidia graphics cards. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix index e76e06654aca0..e00d3f7535b2f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix @@ -8,8 +8,6 @@ with lib; { imports = [ ./installation-cd-graphical-base.nix ]; - isoImage.edition = "plasma5"; - services.xserver = { desktopManager.plasma5 = { enable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 97506045e0e15..bcdbffdc20b7d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -8,7 +8,5 @@ [ ./installation-cd-base.nix ]; - isoImage.edition = "minimal"; - fonts.fontconfig.enable = false; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index b85f20bb09bc3..4558b4dc95521 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -417,17 +417,8 @@ in ''; }; - isoImage.edition = mkOption { - default = ""; - description = '' - Specifies which edition string to use in the volume ID of the generated - ISO image. - ''; - }; - isoImage.volumeID = mkOption { - # nixos-$EDITION-$RELEASE-$ARCH - default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.system}"; + default = "NIXOS_BOOT_CD"; description = '' Specifies the label or volume ID of the generated ISO image. Note that the label is used by stage 1 of the boot process to @@ -524,19 +515,6 @@ in }; config = { - assertions = [ - { - assertion = !(stringLength config.isoImage.volumeID > 32); - # https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor - # Volume Identifier can only be 32 bytes - message = let - length = stringLength config.isoImage.volumeID; - howmany = toString length; - toomany = toString (length - 32); - in - "isoImage.volumeID ${config.isoImage.volumeID} is ${howmany} characters. That is ${toomany} characters longer than the limit of 32."; - } - ]; boot.loader.grub.version = 2; |