From: "Owen Synge" Date: Thu, 7 Aug 2014 08:53:20 +0000 (+0200) Subject: add two high priority bugs found in field X-Git-Tag: suse_cloud4~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3ffb276d31d6a942773c63071cff4ec5dca35e9;p=ceph.git add two high priority bugs found in field --- diff --git a/0017-cephdisk-Preparing-a-block-device-a.patch b/0017-cephdisk-Preparing-a-block-device-a.patch new file mode 100644 index 000000000000..5ee33c316128 --- /dev/null +++ b/0017-cephdisk-Preparing-a-block-device-a.patch @@ -0,0 +1,24 @@ +From: Owen Synge +Date: Thu, 7 Aug 2014 10:21:18 +0200 +Subject: [PATCH] cephdisk:Preparing a block device add --mbrtogpt to sgdisk. + +Convert an MBR or BSD disklabel disk to a GPT disk. As a safety +measure, use of this option is required on MBR or BSD disklabel +disks if you intend to save your changes, in order to prevent +accidentally damaging such disks. +--- + src/ceph-disk | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ceph-disk b/src/ceph-disk +index c67f2f3..0920b68 100755 +--- a/src/ceph-disk ++++ b/src/ceph-disk +@@ -1191,6 +1191,7 @@ def prepare_dev( + command_check_call( + [ + 'sgdisk', ++ '--mbrtogpt', + '--largest-new=1', + '--change-name=1:ceph data', + '--partition-guid=1:{osd_uuid}'.format( diff --git a/ceph.changes b/ceph.changes index 0ea4c7b32724..0d860623b266 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 7 10:37:32 UTC 2014 - osynge@suse.com + +- Work around MBR breaking ceph-disk + + Fix bnc#890738 + + Accepted patch from Dirk Mueller +- Install 95-ceph-osd-alt.rules on older suse versions. + + Fix bnc#890736 + + Suggestion from Dirk Mueller + ------------------------------------------------------------------- Thu Aug 7 08:45:27 UTC 2014 - tbehrens@suse.com diff --git a/ceph.spec b/ceph.spec index 4c6a5672a052..7d325737428c 100644 --- a/ceph.spec +++ b/ceph.spec @@ -115,6 +115,7 @@ Patch0013: 0013-osd-OSD.cc-parse-lsb-release-data-v.patch Patch0014: 0014-osdmaptool-test-map-pgs.t-fix-escap.patch Patch0015: 0015-Convert-remaining-init-script-actio.patch Patch0016: 0016-Fix-bnc-890345-wrong-service-name-f.patch +Patch0017: 0017-cephdisk-Preparing-a-block-device-a.patch # Please do not add patches manually here, run update_git.sh. ################################################################################# @@ -356,6 +357,7 @@ This package contains Ceph benchmarks and test tools. %patch0014 -p1 %patch0015 -p1 %patch0016 -p1 +%patch0017 -p1 %build @@ -446,7 +448,11 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules +%if (0%{?suse_version} < 1310 || 0%{?rhel} < 7) +install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%else install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%endif #set up placeholder directories mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/osd diff --git a/ceph.spec.in b/ceph.spec.in index 436a774542c1..4a329b98617d 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -416,7 +416,11 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules +%if (0%{?suse_version} < 1310 || 0%{?rhel} < 7) +install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%else install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%endif #set up placeholder directories mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/osd