Browse Source

test: add udev settle after sfdisk

master
Harald Hoyer 11 years ago
parent
commit
e54d961160
  1. 1
      test/TEST-01-BASIC/create-root.sh
  2. 1
      test/TEST-02-SYSTEMD/create-root.sh
  3. 1
      test/TEST-03-USR-MOUNT/create-root.sh
  4. 1
      test/TEST-04-FULL-SYSTEMD/create-root.sh
  5. 1
      test/TEST-10-RAID/create-root.sh
  6. 1
      test/TEST-11-LVM/create-root.sh
  7. 1
      test/TEST-12-RAID-DEG/create-root.sh
  8. 1
      test/TEST-13-ENC-RAID-LVM/create-root.sh
  9. 9
      test/TEST-15-BTRFSRAID/create-root.sh
  10. 1
      test/TEST-17-LVM-THIN/create-root.sh

1
test/TEST-01-BASIC/create-root.sh

@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF @@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
,
EOF

udevadm settle
mkfs.ext3 -L dracut /dev/sda2
mkdir -p /root
mount /dev/sda2 /root

1
test/TEST-02-SYSTEMD/create-root.sh

@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF @@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
,
EOF

udevadm settle
mkfs.ext3 -L dracut /dev/sda2
mkdir -p /root
mount /dev/sda2 /root

1
test/TEST-03-USR-MOUNT/create-root.sh

@ -17,6 +17,7 @@ sfdisk -C 5120 -H 2 -S 32 -L /dev/sdb <<EOF @@ -17,6 +17,7 @@ sfdisk -C 5120 -H 2 -S 32 -L /dev/sdb <<EOF
,
EOF

udevadm settle
modprobe btrfs
mkfs.btrfs -L dracut /dev/sda2
mkfs.btrfs -L dracutusr /dev/sdb2

1
test/TEST-04-FULL-SYSTEMD/create-root.sh

@ -17,6 +17,7 @@ sfdisk -C 10240 -H 2 -S 32 -L /dev/sdb <<EOF @@ -17,6 +17,7 @@ sfdisk -C 10240 -H 2 -S 32 -L /dev/sdb <<EOF
,
EOF

udevadm settle

mkfs.btrfs -L dracut /dev/sda2
mkfs.btrfs -L dracutusr /dev/sdb2

1
test/TEST-10-RAID/create-root.sh

@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF @@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
,800
,800
EOF
udevadm settle
mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /dev/sda3 /dev/sda4
# wait for the array to finish initailizing, otherwise this sometimes fails
# randomly.

1
test/TEST-11-LVM/create-root.sh

@ -12,6 +12,7 @@ sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF @@ -12,6 +12,7 @@ sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
,400
,400
EOF
udevadm settle
for i in sda2 sda3 sda4; do
lvm pvcreate -ff -y /dev/$i ;
done && \

1
test/TEST-12-RAID-DEG/create-root.sh

@ -15,6 +15,7 @@ sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF @@ -15,6 +15,7 @@ sfdisk -C 1280 -H 2 -S 32 -L /dev/sda <<EOF
,400
,400
EOF
udevadm settle
mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sdb /dev/sdc /dev/sdd
# wait for the array to finish initailizing, otherwise this sometimes fails
# randomly.

1
test/TEST-13-ENC-RAID-LVM/create-root.sh

@ -13,6 +13,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF @@ -13,6 +13,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
,800
,800
EOF
udevadm settle
echo -n test >keyfile
cryptsetup -q luksFormat /dev/sda2 /keyfile
cryptsetup -q luksFormat /dev/sda3 /keyfile

9
test/TEST-15-BTRFSRAID/create-root.sh

@ -15,14 +15,15 @@ sfdisk -C 327800 -H 2 -S 32 -L /dev/sda <<EOF @@ -15,14 +15,15 @@ sfdisk -C 327800 -H 2 -S 32 -L /dev/sda <<EOF
,5120
,5120
EOF
udevadm settle
mkfs.btrfs -draid10 -mraid10 -L root /dev/sda5 /dev/sda6 /dev/sda7 /dev/sda8
udevadm settle
btrfs device scan
udevadm settle
set -e
mkdir -p /sysroot
mount -t btrfs /dev/sda8 /sysroot
cp -a -t /sysroot /source/*
umount /sysroot
mkdir -p /sysroot
mount -t btrfs /dev/sda8 /sysroot
cp -a -t /sysroot /source/*
umount /sysroot
echo "dracut-root-block-created" >/dev/sda1
poweroff -f

1
test/TEST-17-LVM-THIN/create-root.sh

@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF @@ -12,6 +12,7 @@ sfdisk -C 2560 -H 2 -S 32 -L /dev/sda <<EOF
,800
,800
EOF
udevadm settle
for i in sda2 sda3 sda4; do
lvm pvcreate -ff -y /dev/$i ;
done && \

Loading…
Cancel
Save