From cfdd0f3f530e4488985e8695b8f72f29ba94f05e Mon Sep 17 00:00:00 2001
From: Joerg Steffens <joerg.steffens@bareos.com>
Date: Mon, 9 Nov 2015 12:54:54 +0100
Subject: [PATCH 1/2] SLES12: add support for CEPH

build the packages
- bareos-filedaemon-ceph-plugin
- bareos-storage-ceph
---
 platforms/packaging/bareos.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platforms/packaging/bareos.spec b/platforms/packaging/bareos.spec
index 6d26bf3ff33..bf68c58c8f6 100644
--- a/platforms/packaging/bareos.spec
+++ b/platforms/packaging/bareos.spec
@@ -78,7 +78,10 @@ Vendor: 	The Bareos Team
 %define systemd_support 1
 %endif
 
-
+# SLES 12
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
+%define ceph 1
+%endif
 
 #
 # RedHat (CentOS, Fedora, RHEL) specific settings

From a797c82ad58774defaba24c9cf30d17f5bf82ef3 Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Fri, 4 Mar 2016 15:16:34 +0100
Subject: [PATCH 2/2] Fix inverse logic for automatic labeling with "yes"

---
 src/dird/ua_label.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dird/ua_label.c b/src/dird/ua_label.c
index ff5e83daa90..b984dbd917c 100644
--- a/src/dird/ua_label.c
+++ b/src/dird/ua_label.c
@@ -396,7 +396,7 @@ static void label_from_barcodes(UAContext *ua, int drive,
       ua->send_msg("%4d  %s\n", vl->Slot, vl->VolName);
    }
 
-   if (!yes ||
+   if (!yes &&
        !get_yesno(ua, _("Do you want to label these Volumes? (yes|no): ")) ||
        (ua->pint32_val == 0)) {
       goto bail_out;