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

tests: respect @CONFDIR@/machine-id

Browse Source 
Obtain location of machine-id.

NOTE: lvmconfig cannot dump 'life' value - should be fixed.
This commit is contained in:
Zdenek Kabelac 2015-05-14 10:51:34 +02:00
parent 57a16abe2c
commit a42c1c5728
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/shell/system_id.sh
View File

@ -47,10 +47,12 @@ vgcreate $vg1 "$dev1"
check vg_field $vg1 systemid $SID
vgremove $vg1
## machineid
# FIXME - print 'life' config data
eval $(lvmconfig global/etc 2>/dev/null || lvmconfig --type default global/etc)
if [ -e /etc/machine-id ]; then
SID=$(cat /etc/machine-id)
## machineid
if [ -e $etc/machine-id ]; then
SID=$(cat $etc/machine-id)
aux lvmconf "global/system_id_source = machineid"
vgcreate $vg1 "$dev1"
vgs -o+systemid $vg1
@ -608,8 +610,8 @@ rm -f $SIDFILE
# The commands should proceed without a system_id.
# Look at the warning/error messages.
# vgcreate with source machineid, where no /etc/machine-id file exists
if [ ! -e /etc/machine-id ]; then
# vgcreate with source machineid, where no $etc/machine-id file exists
if [ ! -e $etc/machine-id ]; then
SID=""
aux lvmconf "global/system_id_source = machineid"
vgcreate $vg1 "$dev1" 2>&1 | tee err