diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-10 14:12:16 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-10 14:12:16 -0700 |
| commit | 720aa4663f8933b7eefaa84b221df5d25093f92a (patch) | |
| tree | 5efeaafdbe058851d44b6c49031fb78463eaa1c1 /qa | |
| parent | b25f27705b6dc63a1b8b565afc3aeb9fe0b7f1a4 (diff) | |
| parent | 3d22546101a5e7e63aa534fd755cb7d0bfa515cf (diff) | |
| download | ceph-720aa4663f8933b7eefaa84b221df5d25093f92a.tar.gz | |
Merge remote-tracking branch 'gh/wip-rbd-format'
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/workunits/rbd/copy.sh | 2 | ||||
| -rwxr-xr-x | qa/workunits/rbd/import_export.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh index 5d922920ad9..933b735b786 100755 --- a/qa/workunits/rbd/copy.sh +++ b/qa/workunits/rbd/copy.sh @@ -17,7 +17,7 @@ dd if=/bin/ls of=/tmp/img1 bs=1k seek=10000 dd if=/bin/ln of=/tmp/img1 bs=1k seek=100000 # import, snapshot -rbd import /tmp/img1 testimg1 +rbd import $RBD_CREATE_ARGS /tmp/img1 testimg1 rbd resize testimg1 --size=256 rbd export testimg1 /tmp/img2 rbd snap create testimg1 --snap=snap1 diff --git a/qa/workunits/rbd/import_export.sh b/qa/workunits/rbd/import_export.sh index a2af194b43a..249ee448e3d 100755 --- a/qa/workunits/rbd/import_export.sh +++ b/qa/workunits/rbd/import_export.sh @@ -10,11 +10,11 @@ dd if=/bin/grep of=/tmp/img bs=1k seek=1000000 rbd rm testimg || true -rbd import /tmp/img testimg +rbd import $RBD_CREATE_ARGS /tmp/img testimg rbd export testimg /tmp/img2 cmp /tmp/img /tmp/img2 rm /tmp/img /tmp/img2 -echo OK
\ No newline at end of file +echo OK |