suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

nixos: run parted with --script option

Browse Source 
-s, --script: never prompts for user intervention

Sometimes the NixOS installer tests fail when they invoke parted, e.g.
https://hydra.nixos.org/build/62513826/nixlog/1. But instead of exiting
right there, the tests hang until the Nix builder times out (and kills
the build). With this change the tests would instead fail immediately,
which is preferred.

While at it, use "parted --script" treewide, so nobody gets build
timeout due to parted error (or misuse). (Only nixos/ use it, and only
non-interactive.)

A few instances already use the short option "-s", convert them to long
option "--short".
This commit is contained in:
Bjørn Forsman 2017-10-08 15:35:47 +02:00
parent 415db05504
commit 0ff4bb5f87
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/make-disk-image.nix
View File

@ -80,7 +80,7 @@ let
truncate -s ${toString diskSize}M $diskImage truncate -s ${toString diskSize}M $diskImage
${if partitioned then '' ${if partitioned then ''
parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
offset=$((2048*512)) offset=$((2048*512))
'' else '' '' else ''
offset=0 offset=0

6
nixos/modules/virtualisation/brightbox-image.nix
View File

@ -33,9 +33,9 @@ in
} }
'' ''
# Create partition table # Create partition table
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize}
${pkgs.parted}/sbin/parted /dev/vda print ${pkgs.parted}/sbin/parted --script /dev/vda print
. /sys/class/block/vda1/uevent . /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR mknod /dev/vda1 b $MAJOR $MINOR

64
nixos/tests/installer.nix
View File

@ -260,9 +260,9 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel msdos", "parted --script /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary linux-swap 1M 1024M", "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
"parted /dev/vda -- mkpart primary ext2 1024M -1s", "parted --script /dev/vda -- mkpart primary ext2 1024M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/vda1 -L swap", "mkswap /dev/vda1 -L swap",
"swapon -L swap", "swapon -L swap",
@ -277,11 +277,11 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel gpt", "parted --script /dev/vda mklabel gpt",
"parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
"parted -s /dev/vda -- set 1 boot on", "parted --script /dev/vda -- set 1 boot on",
"parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
"parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -300,10 +300,10 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel msdos", "parted --script /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
"parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
"parted /dev/vda -- mkpart primary ext2 1024M -1s", # / "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -321,10 +321,10 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel msdos", "parted --script /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
"parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
"parted /dev/vda -- mkpart primary ext2 1024M -1s", # / "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -357,9 +357,9 @@ in {
createPartitions = createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel msdos", "parted --script /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary linux-swap 1M 1024M", "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
"parted /dev/vda -- mkpart primary 1024M -1s", "parted --script /dev/vda -- mkpart primary 1024M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/vda1 -L swap", "mkswap /dev/vda1 -L swap",
@ -380,11 +380,11 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel msdos", "parted --script /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary 1M 2048M", # PV1 "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1
"parted /dev/vda -- set 1 lvm on", "parted --script /dev/vda -- set 1 lvm on",
"parted /dev/vda -- mkpart primary 2048M -1s", # PV2 "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2
"parted /dev/vda -- set 2 lvm on", "parted --script /dev/vda -- set 2 lvm on",
"udevadm settle", "udevadm settle",
"pvcreate /dev/vda1 /dev/vda2", "pvcreate /dev/vda1 /dev/vda2",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2", "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
@ -402,10 +402,10 @@ in {
luksroot = makeInstallerTest "luksroot" luksroot = makeInstallerTest "luksroot"
{ createPartitions = '' { createPartitions = ''
$machine->succeed( $machine->succeed(
"parted /dev/vda mklabel msdos", "parted --script /dev/vda mklabel msdos",
"parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
"parted /dev/vda -- mkpart primary linux-swap 50M 1024M", "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
"parted /dev/vda -- mkpart primary 1024M -1s", # LUKS "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -434,7 +434,7 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/vda --" "parted --script /dev/vda --"
. " mklabel msdos" . " mklabel msdos"
. " mkpart primary ext2 1M 100MB" # /boot . " mkpart primary ext2 1M 100MB" # /boot
. " mkpart extended 100M -1s" . " mkpart extended 100M -1s"
@ -469,9 +469,9 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted /dev/sda mklabel msdos", "parted --script /dev/sda mklabel msdos",
"parted /dev/sda -- mkpart primary linux-swap 1M 1024M", "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M",
"parted /dev/sda -- mkpart primary ext2 1024M -1s", "parted --script /dev/sda -- mkpart primary ext2 1024M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/sda1 -L swap", "mkswap /dev/sda1 -L swap",
"swapon -L swap", "swapon -L swap",

4
nixos/tests/virtualbox.nix
View File

@ -107,8 +107,8 @@ let
buildInputs = [ pkgs.utillinux pkgs.perl ]; buildInputs = [ pkgs.utillinux pkgs.perl ];
} '' } ''
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
. /sys/class/block/vda1/uevent . /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR mknod /dev/vda1 b $MAJOR $MINOR