diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-01-23 01:37:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-23 01:37:09 +0000 |
| commit | 15772db47091b35d612f5d50bcf4584330b966ac (patch) | |
| tree | 73566f265abd8e65def02c9a9f158ba540fad622 | |
| parent | 758c219ff3c371dd2e1c07ca7cd0e4c62d9f4c87 (diff) | |
| parent | 06c9c79d31f8903f3e99abc4cdaa28a505436a48 (diff) | |
Merge "Mount xfs image with -o nouuid"
| -rwxr-xr-x | tools/daisy-img-modify.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/daisy-img-modify.sh b/tools/daisy-img-modify.sh index 43fd186b..8b3a21f3 100755 --- a/tools/daisy-img-modify.sh +++ b/tools/daisy-img-modify.sh @@ -177,7 +177,13 @@ setup() { sleep 2 dmsetup ls fdisk -l /dev/${loopdevice:0:5} || true - mount /dev/mapper/$loopdevice $mountdir + + if [ "xfs" = "$(blkid -o value -s TYPE /dev/mapper/$loopdevice)" ]; then + mountopts="-o nouuid" + else + mountopts="" + fi + mount $mountopts /dev/mapper/$loopdevice $mountdir mount -t proc none ${mountdir}/proc if [[ -n $img_size ]]; then |