diff --git a/scripts/ceph/start.sh b/scripts/ceph/start.sh index efea26b40..b4de69142 100755 --- a/scripts/ceph/start.sh +++ b/scripts/ceph/start.sh @@ -12,12 +12,11 @@ mon_dir=${base_dir}/mon.a pid_dir=${base_dir}/pid ceph_conf=${base_dir}/ceph.conf mnt_dir=${base_dir}/mnt -dev_backend=/dev/ceph image=/var/tmp/ceph_raw.img dev=/dev/loop200 umount ${dev}p2 || true -losetup -d $dev_backend || true +losetup -d $dev || true # partition osd if [ -d $base_dir ]; then @@ -30,8 +29,8 @@ if [ ! -e $image ]; then fallocate -l 4G $image fi -mknod ${dev_backend} b 7 200 || true -losetup ${dev_backend} ${image} || true +mknod ${dev} b 7 200 || true +losetup ${dev} ${image} || true PARTED="parted -s" SGDISK="sgdisk" diff --git a/scripts/ceph/stop.sh b/scripts/ceph/stop.sh index 5c1c4a950..40bcf8a7e 100755 --- a/scripts/ceph/stop.sh +++ b/scripts/ceph/stop.sh @@ -4,10 +4,10 @@ set -x base_dir=/var/tmp/ceph image=${base_dir}/ceph_raw.img -dev_backend=/dev/ceph +dev=/dev/loop200 pkill -9 ceph sleep 3 -umount /dev/loop200p2 -losetup -d $dev_backend +umount ${dev}p2 +losetup -d $dev rm -rf $base_dir