From: Sage Weil Date: Mon, 2 Dec 2019 19:33:27 +0000 (-0600) Subject: qa/standalone/test_ceph_daemon.sh: more $SUDO X-Git-Tag: v15.1.0~679^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8aadba15bf2d59bca900ce5c773fff507a9cc57f;p=ceph.git qa/standalone/test_ceph_daemon.sh: more $SUDO Signed-off-by: Sage Weil --- diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh index 907b2d12dff..4665ea71a22 100755 --- a/qa/standalone/test_ceph_daemon.sh +++ b/qa/standalone/test_ceph_daemon.sh @@ -61,9 +61,9 @@ fi $SUDO $CEPH_DAEMON rm-cluster --fsid $FSID --force $SUDO $CEPH_DAEMON rm-cluster --fsid $FSID_LEGACY --force vgchange -an $OSD_VG_NAME || true -loopdev=$(losetup -a | grep $(basename $OSD_IMAGE_NAME) | awk -F : '{print $1}') +loopdev=$($SUDO losetup -a | grep $(basename $OSD_IMAGE_NAME) | awk -F : '{print $1}') if ! [ "$loopdev" = "" ]; then - losetup -d $loopdev + $SUDO losetup -d $loopdev fi TMPDIR=`mktemp -d -p .` @@ -172,7 +172,7 @@ $SUDO $CEPH_DAEMON shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \ # add osd.{1,2,..} dd if=/dev/zero of=$TMPDIR/$OSD_IMAGE_NAME bs=1 count=0 seek=$OSD_IMAGE_SIZE -loop_dev=$(losetup -f) +loop_dev=$($SUDO losetup -f) $SUDO vgremove -f $OSD_VG_NAME || true $SUDO losetup $loop_dev $TMPDIR/$OSD_IMAGE_NAME $SUDO pvcreate $loop_dev && $SUDO vgcreate $OSD_VG_NAME $loop_dev