Revert "iso-image: normalize volumeID"

worldofpeace · web-flow · commit 21b50e6f6879 · 2020-04-09T19:43:59.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ with lib;`
`7`	`7`	`{`
`8`	`8`	`imports = [ ./installation-cd-graphical-base.nix ];`
`9`	`9`
`10`		`- isoImage.edition = "gnome";`
`11`		`-`
`12`	`10`	`services.xserver.desktopManager.gnome3.enable = true;`
`13`	`11`
`14`	`12`	`# Wayland can be problematic for some hardware like Nvidia graphics cards.`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ with lib;`
`8`	`8`	`{`
`9`	`9`	`imports = [ ./installation-cd-graphical-base.nix ];`
`10`	`10`
`11`		`- isoImage.edition = "plasma5";`
`12`		`-`
`13`	`11`	`services.xserver = {`
`14`	`12`	`desktopManager.plasma5 = {`
`15`	`13`	`enable = true;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,5 @@`
`8`	`8`	`[ ./installation-cd-base.nix`
`9`	`9`	`];`
`10`	`10`
`11`		`- isoImage.edition = "minimal";`
`12`		`-`
`13`	`11`	`fonts.fontconfig.enable = false;`
`14`	`12`	`}`