From a34b1baa6ca45b420399ec4cefe3cfe225c14dcf Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 11 Jun 2019 09:56:13 +0200 Subject: [PATCH] test/{10,12,13,14,17,30,31}: increase the disk sizes On Fedora 30 the paritition sizes turn out to be too small again: + mkdir -p /sysroot + mount /dev/dracut/root /sysroot + 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 cp: error writing '/sysroot/usr/lib64/libkrb5.so.3.3': No space left on device cp: error writing '/sysroot/usr/lib64/libkrb5support.so.0.1': No space left on device It turns out that there has been quite some size increase in some libraries, notably glibc, though not all -- some even shrunk, ruling out a toolchain problem. Here's are files over 1M we install on Fedora 30: f29 f30 2.7M => 6.4M /usr/lib64/{libc-2.28.so => libc-2.29.so} 3.1M => 6.0M /usr/lib64/libcrypto.so.1.1.1c 2.0M => 3.5M /usr/lib64/{libm-2.28.so => libm-2.29.so} 2.9M => 2.8M /usr/lib/systemd/{libsystemd-shared-239.so => libsystemd-shared-241.so} 1.7M => 2.5M /usr/lib64/libunistring.so.2.1.0 2.3M => 2.4M /usr/lib64/bind9-export/libdns-export.so.1105.0.0 1.2M => 2.1M /usr/bin/bash 1.1M => 1.4M /usr/lib64/libkrb5.so.3.3 1.2M => 1.4M /usr/lib64/libgcrypt.so.20.2.4 612K => 1.1M /usr/lib64/libssl.so.1.1.1c This increases the image sizes to accomodate for this. There's probably little else we can do. (cherry picked from commit e318ba30fbd84d510a5bbb071d868e523d965869) --- test/TEST-10-RAID/create-root.sh | 6 +++--- test/TEST-10-RAID/test.sh | 2 +- test/TEST-12-RAID-DEG/test.sh | 6 +++--- test/TEST-13-ENC-RAID-LVM/create-root.sh | 6 +++--- test/TEST-13-ENC-RAID-LVM/test.sh | 2 +- test/TEST-14-IMSM/create-root.sh | 6 +++--- test/TEST-14-IMSM/test.sh | 4 ++-- test/TEST-17-LVM-THIN/create-root.sh | 8 ++++---- test/TEST-17-LVM-THIN/test.sh | 2 +- test/TEST-30-ISCSI/test.sh | 6 +++--- test/TEST-31-ISCSI-MULTI/test.sh | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh index 7b5f2a76..af4cac0d 100755 --- a/test/TEST-10-RAID/create-root.sh +++ b/test/TEST-10-RAID/create-root.sh @@ -8,9 +8,9 @@ udevadm control --reload # save a partition at the beginning for future flagging purposes sfdisk /dev/sda <keyfile diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index 99324ce9..9ffe24b1 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -59,7 +59,7 @@ test_run() { test_setup() { # Create the blank file to use as a root filesystem rm -f -- $TESTDIR/root.ext2 - dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80 + dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=134 kernel=$KVERSION # Create what will eventually be our root filesystem onto an overlay diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh index a0324c6f..0d10945b 100755 --- a/test/TEST-14-IMSM/create-root.sh +++ b/test/TEST-14-IMSM/create-root.sh @@ -32,9 +32,9 @@ sfdisk -g /dev/mapper/isw*Test0 # save a partition at the beginning for future flagging purposes sfdisk --no-reread /dev/mapper/isw*Test0 <