← Back to branch summary

~ubuntu-branches/debian/jessie/ceph/jessie

« back to all changes in this revision

Viewing changes to .pc/firefly-post-release.patch/src/init-ceph.in

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2014-07-18 02:33:39 UTC
  • mfrom: (1.2.17)
  • Revision ID: package-import@ubuntu.com-20140718023339-03jdyr6dxl2hx00y
Tags: 0.80.4-1
* New upstream release [July 2014].
* New patches:
  + rbdmap1-mount.patch
  + rbdmap2-hooks.patch
  + rbdmap3-lazyumount.patch
  + bug-8821.patch
* radosgw: removed unused lintian overrides.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/firefly-post-release.patch/src/init-ceph.in
311
311
 
312
312
                if [ "$fs_type" = "btrfs" ]; then
313
313
                    echo Mounting Btrfs on $host:$fs_path
314
 
                    do_root_cmd "modprobe btrfs ; btrfs device scan || btrfsctl -a ; egrep -q '^[^ ]+ $fs_path' /proc/mounts || mount -t btrfs $fs_opt $first_dev $fs_path"
 
314
                    do_root_cmd_okfail "modprobe btrfs ; btrfs device scan || btrfsctl -a ; egrep -q '^[^ ]+ $fs_path' /proc/mounts || mount -t btrfs $fs_opt $first_dev $fs_path"
315
315
                else
316
316
                    echo Mounting $fs_type on $host:$fs_path
317
 
                    do_root_cmd "modprobe $fs_type ; egrep -q '^[^ ]+ $fs_path' /proc/mounts || mount -t $fs_type $fs_opt $first_dev $fs_path"
 
317
                    do_root_cmd_okfail "modprobe $fs_type ; egrep -q '^[^ ]+ $fs_path' /proc/mounts || mount -t $fs_type $fs_opt $first_dev $fs_path"
 
318
                fi
 
319
                if [ "$ERR" != "0" ]; then
 
320
                    EXIT_STATUS=$ERR
 
321
                    continue
318
322
                fi
319
323
            fi
320
324