shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: improve test for machine_id

Browse Source
This commit is contained in:
Zdenek Kabelac 2023-06-23 14:43:07 +02:00
parent 39d6a9601f
commit aed91e49ae
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/shell/system_id.sh
View File

@ -24,10 +24,13 @@ print_lvmlocal() {
aux prepare_devs 5 aux prepare_devs 5
SIDFILE="etc/lvm_test.conf" # get lvm.conf location in a form of: etc=path
LVMLOCAL="etc/lvmlocal.conf" eval "$(lvmconfig global/etc)"
DFDIR="$LVM_SYSTEM_DIR/devices" SIDFILE="$etc/lvm_test.conf"
LVMLOCAL="$etc/lvmlocal.conf"
DFDIR="$etc/devices"
DF="$DFDIR/system.devices" DF="$DFDIR/system.devices"
# Avoid system id validation in the devices file # Avoid system id validation in the devices file
@ -50,10 +53,6 @@ vgcreate $vg1 "$dev1"
check vg_field $vg1 systemid "$SID" check vg_field $vg1 systemid "$SID"
vgremove $vg1 vgremove $vg1
# FIXME - print 'life' config data
#eval "$(lvmconfig global/etc 2>/dev/null || lvmconfig --type default global/etc)"
etc="/etc"
## machineid ## machineid
if [ -e "$etc/machine-id" ]; then if [ -e "$etc/machine-id" ]; then
SID=$(cat "$etc/machine-id") SID=$(cat "$etc/machine-id")
@ -708,4 +707,3 @@ vgs -o+systemid $vg1
check vg_field $vg1 systemid "$SID" check vg_field $vg1 systemid "$SID"
grep "No system ID found from system_id_source" err grep "No system ID found from system_id_source" err
vgremove $vg1 vgremove $vg1