summaryrefslogtreecommitdiffstats
path: root/test/TEST-11-LVM
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xtest/TEST-11-LVM/create-root.sh8
-rwxr-xr-xtest/TEST-11-LVM/finished-false.sh2
-rwxr-xr-xtest/TEST-11-LVM/hard-off.sh3
-rwxr-xr-xtest/TEST-11-LVM/test-init.sh24
-rwxr-xr-xtest/TEST-11-LVM/test.sh90
5 files changed, 22 insertions, 105 deletions
diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh
index 015bfe7..5c0eff1 100755
--- a/test/TEST-11-LVM/create-root.sh
+++ b/test/TEST-11-LVM/create-root.sh
@@ -11,18 +11,18 @@ udevadm control --reload
udevadm settle
set -ex
-for dev in /dev/disk/by-id/ata-disk_disk[123]; do
+for dev in /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[123]; do
lvm pvcreate -ff -y "$dev"
done
-lvm vgcreate dracut /dev/disk/by-id/ata-disk_disk[123]
+lvm vgcreate dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[123]
lvm lvcreate -l 100%FREE -n root dracut
lvm vgchange -ay
-mkfs.ext4 /dev/dracut/root
+mkfs.ext4 -q /dev/dracut/root
mkdir -p /sysroot
mount -t ext4 /dev/dracut/root /sysroot
cp -a -t /sysroot /source/*
umount /sysroot
lvm lvchange -a n /dev/dracut/root
-echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/disk/by-id/ata-disk_marker
+echo "dracut-root-block-created" | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none
poweroff -f
diff --git a/test/TEST-11-LVM/finished-false.sh b/test/TEST-11-LVM/finished-false.sh
deleted file mode 100755
index ecdbef9..0000000
--- a/test/TEST-11-LVM/finished-false.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 1
diff --git a/test/TEST-11-LVM/hard-off.sh b/test/TEST-11-LVM/hard-off.sh
deleted file mode 100755
index 01acb19..0000000
--- a/test/TEST-11-LVM/hard-off.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-getargbool 0 rd.shell || poweroff -f
-getargbool 0 failme && poweroff -f
diff --git a/test/TEST-11-LVM/test-init.sh b/test/TEST-11-LVM/test-init.sh
deleted file mode 100755
index 108e626..0000000
--- a/test/TEST-11-LVM/test-init.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-: > /dev/watchdog
-
-. /lib/dracut-lib.sh
-
-export PATH=/usr/sbin:/usr/bin:/sbin:/bin
-command -v plymouth > /dev/null 2>&1 && plymouth --quit
-exec > /dev/console 2>&1
-
-echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/disk/by-id/ata-disk_marker
-
-export TERM=linux
-export PS1='initramfs-test:\w\$ '
-[ -f /etc/mtab ] || ln -sfn /proc/mounts /etc/mtab
-[ -f /etc/fstab ] || ln -sfn /proc/mounts /etc/fstab
-stty sane
-echo "made it to the rootfs!"
-if getargbool 0 rd.shell; then
- strstr "$(setsid --help)" "control" && CTTY="-c"
- setsid $CTTY sh -i
-fi
-echo "Powering down."
-mount -n -o remount,ro /
-poweroff -f
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index 2782810..fb76ab9 100755
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -8,76 +8,35 @@ TEST_DESCRIPTION="root filesystem on LVM PV"
test_run() {
declare -a disk_args=()
- # shellcheck disable=SC2034
declare -i disk_index=0
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/disk-1.img disk1
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/disk-2.img disk2
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/disk-3.img disk3
+ qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker
+ qemu_add_drive disk_index disk_args "$TESTDIR"/disk-1.img disk1
+ qemu_add_drive disk_index disk_args "$TESTDIR"/disk-2.img disk2
+ qemu_add_drive disk_index disk_args "$TESTDIR"/disk-3.img disk3
test_marker_reset
"$testdir"/run-qemu \
"${disk_args[@]}" \
- -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
+ -append "root=/dev/dracut/root rw rd.auto=1 rd.retry=3" \
-initrd "$TESTDIR"/initramfs.testing || return 1
test_marker_check || return 1
}
test_setup() {
- kernel=$KVERSION
# Create what will eventually be our root filesystem onto an overlay
- (
- # shellcheck disable=SC2030
- export initdir=$TESTDIR/overlay/source
- # shellcheck disable=SC1090
- . "$PKGLIBDIR"/dracut-init.sh
- (
- cd "$initdir" || exit
- mkdir -p -- dev sys proc etc var/run tmp
- mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
- )
- inst_multiple sh df free ls shutdown poweroff stty cat ps ln \
- mount dmesg mkdir cp dd sync
- for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
- [ -f ${_terminfodir}/l/linux ] && break
- done
- inst_multiple -o ${_terminfodir}/l/linux
-
- inst_simple "${PKGLIBDIR}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
- inst_simple "${PKGLIBDIR}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh"
- inst_binary "${PKGLIBDIR}/dracut-util" "/usr/bin/dracut-util"
- ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
- ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
-
- inst_multiple grep
- inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth > /dev/null && inst_multiple plymouth
- cp -a /etc/ld.so.conf* "$initdir"/etc
- mkdir -p "$initdir"/run
- ldconfig -r "$initdir"
- )
+ "$DRACUT" -N -l --keep --tmpdir "$TESTDIR" \
+ -m "test-root" \
+ -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1
+ mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.*
# second, install the files needed to make the root filesystem
- (
- # shellcheck disable=SC2031
- # shellcheck disable=SC2030
- export initdir=$TESTDIR/overlay
- # shellcheck disable=SC1090
- . "$PKGLIBDIR"/dracut-init.sh
- inst_multiple sfdisk mkfs.ext4 poweroff cp umount dd sync
- inst_hook initqueue 01 ./create-root.sh
- inst_hook initqueue/finished 01 ./finished-false.sh
- )
-
# create an initramfs that will create the target root filesystem.
# We do it this way so that we do not risk trashing the host mdraid
# devices, volume groups, encrypted partitions, etc.
- "$DRACUT" -l -i "$TESTDIR"/overlay / \
- -m "bash lvm mdraid kernel-modules qemu" \
- -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
- --no-hostonly-cmdline -N \
+ "$DRACUT" -N -l -i "$TESTDIR"/overlay / \
+ -m "test-makeroot bash lvm mdraid kernel-modules" \
+ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
-f "$TESTDIR"/initramfs.makeroot "$KVERSION" || return 1
rm -rf -- "$TESTDIR"/overlay
@@ -85,10 +44,10 @@ test_setup() {
declare -a disk_args=()
# shellcheck disable=SC2034
declare -i disk_index=0
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker 1
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/disk-1.img disk1 40
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/disk-2.img disk2 40
- qemu_add_drive_args disk_index disk_args "$TESTDIR"/disk-3.img disk3 40
+ qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker 1
+ qemu_add_drive disk_index disk_args "$TESTDIR"/disk-1.img disk1 40
+ qemu_add_drive disk_index disk_args "$TESTDIR"/disk-2.img disk2 40
+ qemu_add_drive disk_index disk_args "$TESTDIR"/disk-3.img disk3 40
"$testdir"/run-qemu \
"${disk_args[@]}" \
@@ -96,21 +55,8 @@ test_setup() {
-initrd "$TESTDIR"/initramfs.makeroot || return 1
test_marker_check dracut-root-block-created || return 1
- (
- # shellcheck disable=SC2031
- export initdir=$TESTDIR/overlay
- # shellcheck disable=SC1090
- . "$PKGLIBDIR"/dracut-init.sh
- inst_multiple poweroff shutdown dd
- inst_hook shutdown-emergency 000 ./hard-off.sh
- inst_hook emergency 000 ./hard-off.sh
- )
- "$DRACUT" -l -i "$TESTDIR"/overlay / \
- -o "plymouth network kernel-network-modules" \
- -a "debug" \
- -d "piix ide-gd_mod ata_piix ext4 sd_mod" \
- --no-hostonly-cmdline -N \
- -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
+ test_dracut \
+ "$TESTDIR"/initramfs.testing
}
# shellcheck disable=SC1090
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 02:51:05 +0000