e83cdd
From a34b1baa6ca45b420399ec4cefe3cfe225c14dcf Mon Sep 17 00:00:00 2001
e83cdd
From: Lubomir Rintel <lkundrak@v3.sk>
e83cdd
Date: Tue, 11 Jun 2019 09:56:13 +0200
e83cdd
Subject: [PATCH] test/{10,12,13,14,17,30,31}: increase the disk sizes
e83cdd
e83cdd
On Fedora 30 the paritition sizes turn out to be too small again:
e83cdd
e83cdd
  + mkdir -p /sysroot
e83cdd
  + mount /dev/dracut/root /sysroot
e83cdd
  + cp -a -t /sysroot /source/bin /source/dev /source/etc /source/lib /source/lib64 /source/proc /source/root /source/sbin /source/sys /source/tmp /source/usr /source/var
e83cdd
  cp: error writing '/sysroot/usr/lib64/libkrb5.so.3.3': No space left on device
e83cdd
  cp: error writing '/sysroot/usr/lib64/libkrb5support.so.0.1': No space left on device
e83cdd
e83cdd
It turns out that there has been quite some size increase in some libraries,
e83cdd
notably glibc, though not all -- some even shrunk, ruling out a toolchain
e83cdd
problem. Here's are files over 1M we install on Fedora 30:
e83cdd
e83cdd
   f29    f30
e83cdd
  2.7M => 6.4M /usr/lib64/{libc-2.28.so => libc-2.29.so}
e83cdd
  3.1M => 6.0M /usr/lib64/libcrypto.so.1.1.1c
e83cdd
  2.0M => 3.5M /usr/lib64/{libm-2.28.so => libm-2.29.so}
e83cdd
  2.9M => 2.8M /usr/lib/systemd/{libsystemd-shared-239.so => libsystemd-shared-241.so}
e83cdd
  1.7M => 2.5M /usr/lib64/libunistring.so.2.1.0
e83cdd
  2.3M => 2.4M /usr/lib64/bind9-export/libdns-export.so.1105.0.0
e83cdd
  1.2M => 2.1M /usr/bin/bash
e83cdd
  1.1M => 1.4M /usr/lib64/libkrb5.so.3.3
e83cdd
  1.2M => 1.4M /usr/lib64/libgcrypt.so.20.2.4
e83cdd
  612K => 1.1M /usr/lib64/libssl.so.1.1.1c
e83cdd
e83cdd
This increases the image sizes to accomodate for this. There's probably
e83cdd
little else we can do.
e83cdd
e83cdd
(cherry picked from commit e318ba30fbd84d510a5bbb071d868e523d965869)
e83cdd
---
e83cdd
 test/TEST-10-RAID/create-root.sh         | 6 +++---
e83cdd
 test/TEST-10-RAID/test.sh                | 2 +-
e83cdd
 test/TEST-12-RAID-DEG/test.sh            | 6 +++---
e83cdd
 test/TEST-13-ENC-RAID-LVM/create-root.sh | 6 +++---
e83cdd
 test/TEST-13-ENC-RAID-LVM/test.sh        | 2 +-
e83cdd
 test/TEST-14-IMSM/create-root.sh         | 6 +++---
e83cdd
 test/TEST-14-IMSM/test.sh                | 4 ++--
e83cdd
 test/TEST-17-LVM-THIN/create-root.sh     | 8 ++++----
e83cdd
 test/TEST-17-LVM-THIN/test.sh            | 2 +-
e83cdd
 test/TEST-30-ISCSI/test.sh               | 6 +++---
e83cdd
 test/TEST-31-ISCSI-MULTI/test.sh         | 6 +++---
e83cdd
 11 files changed, 27 insertions(+), 27 deletions(-)
e83cdd
e83cdd
diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
e83cdd
index 7b5f2a76..af4cac0d 100755
e83cdd
--- a/test/TEST-10-RAID/create-root.sh
e83cdd
+++ b/test/TEST-10-RAID/create-root.sh
e83cdd
@@ -8,9 +8,9 @@ udevadm control --reload
e83cdd
 # save a partition at the beginning for future flagging purposes
e83cdd
 sfdisk /dev/sda <
e83cdd
 ,4M
e83cdd
-,25M
e83cdd
-,25M
e83cdd
-,25M
e83cdd
+,41M
e83cdd
+,41M
e83cdd
+,41M
e83cdd
 EOF
e83cdd
 udevadm settle
e83cdd
 mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/sda2 /dev/sda3 /dev/sda4
e83cdd
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
e83cdd
index 0beb26c3..07179a29 100755
e83cdd
--- a/test/TEST-10-RAID/test.sh
e83cdd
+++ b/test/TEST-10-RAID/test.sh
e83cdd
@@ -22,7 +22,7 @@ test_setup() {
e83cdd
     DISKIMAGE=$TESTDIR/TEST-10-RAID-root.img
e83cdd
     # Create the blank file to use as a root filesystem
e83cdd
     rm -f -- $DISKIMAGE
e83cdd
-    dd if=/dev/null of=$DISKIMAGE bs=1M seek=80
e83cdd
+    dd if=/dev/null of=$DISKIMAGE bs=1M seek=128
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
e83cdd
index c82cde1e..920baafd 100755
e83cdd
--- a/test/TEST-12-RAID-DEG/test.sh
e83cdd
+++ b/test/TEST-12-RAID-DEG/test.sh
e83cdd
@@ -59,9 +59,9 @@ test_setup() {
e83cdd
     # Create the blank file to use as a root filesystem
e83cdd
     rm -f -- $TESTDIR/root.ext2
e83cdd
     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=40
e83cdd
-    dd if=/dev/null of=$TESTDIR/disk1.img bs=1M seek=20
e83cdd
-    dd if=/dev/null of=$TESTDIR/disk2.img bs=1M seek=20
e83cdd
-    dd if=/dev/null of=$TESTDIR/disk3.img bs=1M seek=20
e83cdd
+    dd if=/dev/null of=$TESTDIR/disk1.img bs=1M seek=35
e83cdd
+    dd if=/dev/null of=$TESTDIR/disk2.img bs=1M seek=35
e83cdd
+    dd if=/dev/null of=$TESTDIR/disk3.img bs=1M seek=35
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd
diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
e83cdd
index 72bc765f..13e65838 100755
e83cdd
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
e83cdd
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
e83cdd
@@ -9,9 +9,9 @@ udevadm control --reload
e83cdd
 # save a partition at the beginning for future flagging purposes
e83cdd
 sfdisk /dev/sda <
e83cdd
 ,4M
e83cdd
-,25M
e83cdd
-,25M
e83cdd
-,25M
e83cdd
+,43M
e83cdd
+,43M
e83cdd
+,43M
e83cdd
 EOF
e83cdd
 udevadm settle
e83cdd
 printf test >keyfile
e83cdd
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
e83cdd
index 99324ce9..9ffe24b1 100755
e83cdd
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
e83cdd
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
e83cdd
@@ -59,7 +59,7 @@ test_run() {
e83cdd
 test_setup() {
e83cdd
     # Create the blank file to use as a root filesystem
e83cdd
     rm -f -- $TESTDIR/root.ext2
e83cdd
-    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
e83cdd
+    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=134
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd
diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh
e83cdd
index a0324c6f..0d10945b 100755
e83cdd
--- a/test/TEST-14-IMSM/create-root.sh
e83cdd
+++ b/test/TEST-14-IMSM/create-root.sh
e83cdd
@@ -32,9 +32,9 @@ sfdisk -g /dev/mapper/isw*Test0
e83cdd
 # save a partition at the beginning for future flagging purposes
e83cdd
 sfdisk --no-reread /dev/mapper/isw*Test0 <
e83cdd
 ,4M
e83cdd
-,20M
e83cdd
-,20M
e83cdd
-,20M
e83cdd
+,28M
e83cdd
+,28M
e83cdd
+,28M
e83cdd
 EOF
e83cdd
 
e83cdd
 udevadm settle
e83cdd
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
e83cdd
index ed60f052..a3e52b53 100755
e83cdd
--- a/test/TEST-14-IMSM/test.sh
e83cdd
+++ b/test/TEST-14-IMSM/test.sh
e83cdd
@@ -53,8 +53,8 @@ test_setup() {
e83cdd
     rm -f -- $TESTDIR/disk1
e83cdd
     rm -f -- $TESTDIR/disk2
e83cdd
     dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=1
e83cdd
-    dd if=/dev/null of=$TESTDIR/disk1 bs=1M seek=80
e83cdd
-    dd if=/dev/null of=$TESTDIR/disk2 bs=1M seek=80
e83cdd
+    dd if=/dev/null of=$TESTDIR/disk1 bs=1M seek=104
e83cdd
+    dd if=/dev/null of=$TESTDIR/disk2 bs=1M seek=104
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd
diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh
e83cdd
index 0e52f879..6e09012e 100755
e83cdd
--- a/test/TEST-17-LVM-THIN/create-root.sh
e83cdd
+++ b/test/TEST-17-LVM-THIN/create-root.sh
e83cdd
@@ -8,16 +8,16 @@ udevadm control --reload
e83cdd
 # save a partition at the beginning for future flagging purposes
e83cdd
 sfdisk /dev/sda <
e83cdd
 ,4M
e83cdd
-,25M
e83cdd
-,25M
e83cdd
-,25M
e83cdd
+,29M
e83cdd
+,29M
e83cdd
+,29M
e83cdd
 EOF
e83cdd
 udevadm settle
e83cdd
 for i in sda2 sda3 sda4; do
e83cdd
 lvm pvcreate -ff  -y /dev/$i ;
e83cdd
 done && \
e83cdd
 lvm vgcreate dracut /dev/sda[234] && \
e83cdd
-lvm lvcreate -l 16  -T dracut/mythinpool && \
e83cdd
+lvm lvcreate -l 17  -T dracut/mythinpool && \
e83cdd
 lvm lvcreate -V1G -T dracut/mythinpool -n root && \
e83cdd
 lvm vgchange -ay && \
e83cdd
 mke2fs /dev/dracut/root && \
e83cdd
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
e83cdd
index c13e9063..c7247c91 100755
e83cdd
--- a/test/TEST-17-LVM-THIN/test.sh
e83cdd
+++ b/test/TEST-17-LVM-THIN/test.sh
e83cdd
@@ -19,7 +19,7 @@ test_run() {
e83cdd
 
e83cdd
 test_setup() {
e83cdd
     # Create the blank file to use as a root filesystem
e83cdd
-    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
e83cdd
+    dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=92
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
e83cdd
index d5a6ba58..c126e3dd 100755
e83cdd
--- a/test/TEST-30-ISCSI/test.sh
e83cdd
+++ b/test/TEST-30-ISCSI/test.sh
e83cdd
@@ -109,9 +109,9 @@ test_setup() {
e83cdd
     fi
e83cdd
 
e83cdd
     # Create the blank file to use as a root filesystem
e83cdd
-    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=40
e83cdd
-    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=40
e83cdd
-    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=40
e83cdd
+    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=45
e83cdd
+    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=45
e83cdd
+    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=45
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd
diff --git a/test/TEST-31-ISCSI-MULTI/test.sh b/test/TEST-31-ISCSI-MULTI/test.sh
e83cdd
index 20db2451..122c69e3 100755
e83cdd
--- a/test/TEST-31-ISCSI-MULTI/test.sh
e83cdd
+++ b/test/TEST-31-ISCSI-MULTI/test.sh
e83cdd
@@ -131,9 +131,9 @@ test_setup() {
e83cdd
     fi
e83cdd
 
e83cdd
     # Create the blank file to use as a root filesystem
e83cdd
-    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=40
e83cdd
-    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=40
e83cdd
-    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=40
e83cdd
+    dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=45
e83cdd
+    dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=45
e83cdd
+    dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=45
e83cdd
 
e83cdd
     kernel=$KVERSION
e83cdd
     # Create what will eventually be our root filesystem onto an overlay
e83cdd