public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #97146: 'staging-next' branch

Browse Source 
This is the last planned iteration before forking 20.09.
This commit is contained in:
Vladimír Čunát
2020-09-07 15:43:36 +02:00
parent 5aea56aa45 1936b11f63
commit c1c85b9bad
170 changed files with 1091 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/installer.nix
+4 -5
View File
@@ -317,7 +317,6 @@ let
texinfo
unionfs-fuse
xorg.lndir
(lvm2.override { udev = null; }) # for initrd (extra-utils)
# add curl so that rather than seeing the test attempt to download
# curl's tarball, we see what it's trying to download
@@ -634,10 +633,10 @@ in {
+ " mklabel msdos"
+ " mkpart primary ext2 1M 100MB" # /boot
+ " mkpart extended 100M -1s"
+ " mkpart logical 102M 2102M" # md0 (root), first device
+ " mkpart logical 2103M 4103M" # md0 (root), second device
+ " mkpart logical 4104M 4360M" # md1 (swap), first device
+ " mkpart logical 4361M 4617M", # md1 (swap), second device
+ " mkpart logical 102M 3102M" # md0 (root), first device
+ " mkpart logical 3103M 6103M" # md0 (root), second device
+ " mkpart logical 6104M 6360M" # md1 (swap), first device
+ " mkpart logical 6361M 6617M", # md1 (swap), second device
"udevadm settle",
"ls -l /dev/vda* >&2",
"cat /proc/partitions >&2",