FIX: fix labels if the user requests on volumes

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1475768

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

Author: runcom

volume/volume.go

@@ -106,7 +106,19 @@ type MountPoint struct {
 
 // Setup sets up a mount point by either mounting the volume if it is
 // configured, or creating the source directory if supplied.
-func (m *MountPoint) Setup(mountLabel string) (string, error) {
+func (m *MountPoint) Setup(mountLabel string) (path string, err error) {
+	defer func() {
+		if err == nil {
+			if label.RelabelNeeded(m.Mode) {
+				if err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil {
+					path = ""
+					err = fmt.Errorf("error setting label on mount source '%s': %v", m.Source, err)
+					return
+				}
+			}
+		}
+		return
+	}()
 	if m.Volume != nil {
 		if m.ID == "" {
 			m.ID = stringid.GenerateNonCryptoID()
@@ -124,11 +136,6 @@ func (m *MountPoint) Setup(mountLabel string) (string, error) {
 			}
 		}
 	}
-	if label.RelabelNeeded(m.Mode) {
-		if err := label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil {
-			return "", err
-		}
-	}
 	return m.Source, nil
 }