root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup code, remove sync

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-12 10:27:53 +02:00
parent 25ad62b637
commit 25804ca5ad
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
usr/bin/archboot-testsuite.sh
View file

@ -2,8 +2,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
_LOG=testsuite.log _LOG="testsuite.log"
_APPNAME=${0##*/} _APPNAME=${0##*/}
_LOOP="/dev/loop0"
_IMG="/test.img"
_PASS="/passphrase"
_usage () { _usage () {
echo -e "\e[1mTestsuite for Archboot Environment\e[m" echo -e "\e[1mTestsuite for Archboot Environment\e[m"
echo -e "\e[1m---------------------------------------------\e[m" echo -e "\e[1m---------------------------------------------\e[m"
@ -91,53 +94,53 @@ for i in $(pacman -Ql $(pacman -Q | sd ' .*' '') | rg -o '/usr/share/licenses/.*
done done
_result license-error.txt _result license-error.txt
_run_test "filesystems" _run_test "filesystems"
dd if=/dev/zero of=/test.img bs=1M count=1000 &>"${_NO_LOG}" dd if=/dev/zero of="${_IMG}" bs=1M count=1000 &>"${_NO_LOG}"
sync sync
losetup -f /test.img losetup -f "${_IMG}"
for i in bcachefs btrfs ext4 swap vfat xfs; do for i in bcachefs btrfs ext4 swap vfat xfs; do
if [[ "${i}" == "swap" ]]; then if [[ "${i}" == "swap" ]]; then
mkswap /dev/loop0 &>"${_NO_LOG}" ||\ mkswap "${_LOOP}" &>"${_NO_LOG}" ||\
echo "Creation error: ${i}" >> filesystems-error.log echo "Creation error: ${i}" >> filesystems-error.log
else else
mkfs.${i} /dev/loop0 &>"${_NO_LOG}" ||\ mkfs.${i} "${_LOOP}" &>"${_NO_LOG}" ||\
echo "Creation error: ${i}" >> filesystems-error.log echo "Creation error: ${i}" >> filesystems-error.log
mount /dev/loop0 /mnt &>"${_NO_LOG}" ||\ mount "${_LOOP}" /mnt &>"${_NO_LOG}" ||\
echo "Mount error: ${i}" >> filesystems-error.log echo "Mount error: ${i}" >> filesystems-error.log
umount /mnt &>"${_NO_LOG}" || echo "Unmount error: ${i}" >> filesystems-error.log umount /mnt &>"${_NO_LOG}" || echo "Unmount error: ${i}" >> filesystems-error.log
fi fi
wipefs -a /dev/loop0 &>"${_NO_LOG}" wipefs -a "${_LOOP}" &>"${_NO_LOG}"
done done
_result filesystems-error.log _result filesystems-error.log
_run_test "blockdevices" _run_test "blockdevices"
mdadm --create /dev/md0 --run --level=1 --raid-devices=2 /dev/loop0 missing &>"${_NO_LOG}" ||\ mdadm --create /dev/md0 --run --level=1 --raid-devices=2 "${_LOOP}" missing &>"${_NO_LOG}" ||\
echo "Creation error: mdadm" >> blockdevices-error.log echo "Creation error: mdadm" >> blockdevices-error.log
wipefs -a -f /dev/md0 &>"${_NO_LOG}" wipefs -a -f /dev/md0 &>"${_NO_LOG}"
mdadm --manage --stop /dev/md0 &>"${_NO_LOG}" ||\ mdadm --manage --stop /dev/md0 &>"${_NO_LOG}" ||\
echo "Stop error: mdadm" >> blockdevices-error.log echo "Remove error: mdadm" >> blockdevices-error.log
wipefs -a -f /dev/loop0 &>"${_NO_LOG}" wipefs -a -f "${_LOOP}" &>"${_NO_LOG}"
dd if=/dev/zero of=/test.img bs=1M count=10 &>"${_NO_LOG}" dd if=/dev/zero of="${_IMG}" bs=1M count=10 &>"${_NO_LOG}"
sync sync
pvcreate -y /dev/loop0 &>"${_NO_LOG}" ||\ pvcreate -y "${_LOOP}" &>"${_NO_LOG}" ||\
echo "Creation error: lvm pv" >> blockdevices-error.log echo "Creation error: lvm pv" >> blockdevices-error.log
vgcreate /dev/mapper/test /dev/loop0 &>"${_NO_LOG}" ||\ vgcreate /dev/mapper/test "${_LOOP}" &>"${_NO_LOG}" ||\
echo "Creation error: lvm vg" >> blockdevices-error.log echo "Creation error: lvm vg" >> blockdevices-error.log
lvcreate -W y -C y -y -l +100%FREE /dev/mapper/test -n /dev/mapper/test-test &>"${_NO_LOG}" ||\ lvcreate -W y -C y -y -l +100%FREE /dev/mapper/test -n /dev/mapper/test-test &>"${_NO_LOG}" ||\
echo "Creation error: lvm lv" >> blockdevices-error.log echo "Creation error: lvm lv" >> blockdevices-error.log
lvremove -f /dev/mapper/test-test &>"${_NO_LOG}" ||\ lvremove -f /dev/mapper/test-test &>"${_NO_LOG}" ||\
echo "Stop error: lvm lv" >> blockdevices-error.log echo "Remove error: lvm lv" >> blockdevices-error.log
vgremove -f test &>"${_NO_LOG}" ||\ vgremove -f test &>"${_NO_LOG}" ||\
echo "Stop error: lvm vg" >> blockdevices-error.log echo "Remove error: lvm vg" >> blockdevices-error.log
pvremove -f /dev/loop0 &>"${_NO_LOG}" ||\ pvremove -f "${_LOOP}" &>"${_NO_LOG}" ||\
echo "Stop error: lvm pv" >> blockdevices-error.log echo "Remove error: lvm pv" >> blockdevices-error.log
echo "12345678" >/passphrase echo "12345678" >"${_PASS}"
cryptsetup -q luksFormat /dev/loop0 </passphrase ||\ cryptsetup -q luksFormat "${_LOOP}" <"${_PASS}" ||\
echo "Creation error: cryptsetup" >> blockdevices-error.log echo "Creation error: cryptsetup" >> blockdevices-error.log
cryptsetup luksOpen /dev/loop0 testluks </passphrase ||\ cryptsetup luksOpen "${_LOOP}" testluks <"${_PASS}" ||\
echo "Creation error: cryptsetup open" >> blockdevices-error.log echo "Creation error: cryptsetup open" >> blockdevices-error.log
cryptsetup remove testluks ||\ cryptsetup remove testluks ||\
echo "Stop error: cryptsetup" >> blockdevices-error.log echo "Remove error: cryptsetup" >> blockdevices-error.log
losetup -D losetup -D
rm /test.img rm "${_IMG}"
_result blockdevices-error.log _result blockdevices-error.log
_run_test "Wi-Fi iwctl" _run_test "Wi-Fi iwctl"
archboot-hwsim.sh test &>"${_NO_LOG}" archboot-hwsim.sh test &>"${_NO_LOG}"

1
usr/lib/archboot/installer/mountpoints.sh
View file

@ -490,7 +490,6 @@ _mkfs() {
vfat) mkfs.vfat -F32 ${7} -n "${6}" ${1} &>"${_LOG}" || : >/tmp/.mp-error ;; vfat) mkfs.vfat -F32 ${7} -n "${6}" ${1} &>"${_LOG}" || : >/tmp/.mp-error ;;
xfs) mkfs.xfs ${7} -L "${6}" -f ${1} &>"${_LOG}"|| : >/tmp/.mp-error ;; xfs) mkfs.xfs ${7} -L "${6}" -f ${1} &>"${_LOG}"|| : >/tmp/.mp-error ;;
esac esac
sync
if [[ -f "/tmp/.mp-error" ]]; then if [[ -f "/tmp/.mp-error" ]]; then
_progress "100" "ERROR: Creating filesystem ${2} on ${1}" 0 0 _progress "100" "ERROR: Creating filesystem ${2} on ${1}" 0 0
sleep 5 sleep 5