Skip to content

[20.03] iso-image: normalize volumeID #84863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Apr 10, 2020
Merged

[20.03] iso-image: normalize volumeID #84863

merged 4 commits into from
Apr 10, 2020
+30 −3

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

I want https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/107 to recognize 20.03.
https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/107#note_313094852

Backports #83551, see that thread also.

How to test

Build the iso. Does the OS recognize the iso with the new volume ID?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@worldofpeace
make-iso9660-image.sh: enable joliet extension
84b906d 
This is per the advice of the osinfo-db maintainers https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/107#note_313094852

(cherry picked from commit f59aa66)
@worldofpeace
iso-image: normalize volumeID
519ace8 
The volumeID will now be in the format of:
nixos-$EDITON-$RELEASE-$ARCH

an example for the minimal image would look like:
nixos-minimal-20.09-x86-64-linux

(cherry picked from commit 70a8e9a)
@worldofpeace
iso-image: make sure volumeID is less than 32 chars
0a63410 
(cherry picked from commit 591e8d5)
@worldofpeace worldofpeace changed the title iso-image: normalize volumeID [20.03] iso-image: normalize volumeID Apr 9, 2020
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 9, 2020
@worldofpeace
iso-image: make $ARCH shorter
17d67c0 
we use stdenv.hostPlatform.uname.processor, which I believe is just like
`uname -p`.

Example values:
```
(import <nixpkgs> { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor
"x86_64"

(import <nixpkgs> { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor
aarch64

(import <nixpkgs> { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor
"armv7l"
```

(cherry picked from commit df8c30f)
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Apr 10, 2020 •
edited
Loading

Added the commit for the little mishap.
#84865

@worldofpeace
Copy link
Contributor Author

isoinfo of the aarch64-linux minimal image built

isoinfo -d -i ./result/iso/nixos-minimal-20.03beta-81915.gfedcba-aarch64-linux.iso 
Setting input-charset to 'UTF-8' from locale.
CD-ROM is in ISO 9660 format
System id: 
Volume id: nixos-minimal-20.03-aarch64
Volume set id: 
Publisher id: NIXOS
Data preparer id: XORRISO-1.5.2 2019.10.26.180001, LIBISOBURN-1.5.2, LIBISOFS-1.5.2, LIBBURN-1.5.2
Application id: NIXOS
Copyright File id: 
Abstract File id: 
Bibliographic File id: 
Volume set size is: 1
Volume set sequence number is: 1
Logical block size is: 2048
Volume size is: 291595
El Torito VD version 1 found, boot catalog is in sector 44

Joliet with UCS level 3 found.
SUSP signatures version 1 found
Rock Ridge signatures version 1 found
Rock Ridge id 'RRIP_1991A'
Eltorito validation header:
    Hid 1
    Arch 239 (Unknown Arch)
    ID ''
    Cksum AA 66 OK
    Key 55 AA
    Eltorito defaultboot header:
        Bootid 88 (bootable)
        Boot media 0 (No Emulation Boot)
        Load segment 0
        Sys type 0
        Nsect 0
        Bootoff 2D 45

mmilata
mmilata approved these changes Apr 10, 2020
View reviewed changes
Copy link
Member

@mmilata mmilata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built the minimal ISO, tested installer, everything works as expected.

@worldofpeace worldofpeace merged commit 9e50a36 into NixOS:release-20.03 Apr 10, 2020
@worldofpeace worldofpeace deleted the backport-83551 branch April 10, 2020 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmilata mmilata

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @mmilata