BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #84864 from NixOS/revert-83551-iso-id

Browse source 
Revert "iso-image: normalize volumeID"
This commit is contained in:
worldofpeace 2020-04-09 19:47:31 -04:00 committed by GitHub
commit 2f2c44b936
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/lib/make-iso9660-image.sh
View file

@ -107,7 +107,6 @@ xorriso="xorriso
-publisher nixos -publisher nixos
-graft-points -graft-points
-full-iso9660-filenames -full-iso9660-filenames
-joliet
${isoBootFlags} ${isoBootFlags}
${usbBootFlags} ${usbBootFlags}
${efiBootFlags} ${efiBootFlags}

2
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View file

@ -18,6 +18,8 @@ with lib;
# ISO naming. # ISO naming.
isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso"; isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
isoImage.volumeID = substring 0 11 "NIXOS_ISO";
# EFI booting # EFI booting
isoImage.makeEfiBootable = true; isoImage.makeEfiBootable = true;

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View file

@ -7,8 +7,6 @@ with lib;
{ {
imports = [ ./installation-cd-graphical-base.nix ]; imports = [ ./installation-cd-graphical-base.nix ];
isoImage.edition = "gnome";
services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome3.enable = true;
# Wayland can be problematic for some hardware like Nvidia graphics cards. # Wayland can be problematic for some hardware like Nvidia graphics cards.

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
View file

@ -8,8 +8,6 @@ with lib;
{ {
imports = [ ./installation-cd-graphical-base.nix ]; imports = [ ./installation-cd-graphical-base.nix ];
isoImage.edition = "plasma5";
services.xserver = { services.xserver = {
desktopManager.plasma5 = { desktopManager.plasma5 = {
enable = true; enable = true;

2
nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
View file

@ -8,7 +8,5 @@
[ ./installation-cd-base.nix [ ./installation-cd-base.nix
]; ];
isoImage.edition = "minimal";
fonts.fontconfig.enable = false; fonts.fontconfig.enable = false;
} }

24
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -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 { isoImage.volumeID = mkOption {
# nixos-$EDITION-$RELEASE-$ARCH default = "NIXOS_BOOT_CD";
default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.system}";
description = '' description = ''
Specifies the label or volume ID of the generated ISO image. 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 Note that the label is used by stage 1 of the boot process to
@ -524,19 +515,6 @@ in
}; };
config = { 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; boot.loader.grub.version = 2;