Merge pull request #9193 from aaannz/no-partition-for-storage

Do not create partition on extra storage disk

uyuni/uyuni-storage-setup/scripts/mgr-storage-proxy

@@ -58,9 +58,6 @@ check_mountpoint $storage_location
 info "Checking disk for content signature"
 check_content_signature $storage_disk
 
-info "Creating partition on disk $storage_disk"
-create_partition $storage_disk
-
 info "Creating $storage_fs filesystem"
 create_filesystem $storage_disk $storage_fs
 

uyuni/uyuni-storage-setup/scripts/mgr-storage-server

@@ -84,9 +84,6 @@ fi
 info "Checking disk for content signature"
 check_content_signature $storage_disk
 
-info "Creating partition on disk $storage_disk"
-create_partition $storage_disk
-
 info "Creating $storage_fs filesystem"
 create_filesystem $storage_disk $storage_fs
 
@@ -97,9 +94,6 @@ if [ "$database_disk" != "$storage_disk" ]; then
     info "Checking data base disk for content signature"
     check_content_signature $database_disk
 
-    info "Creating partition on disk $database_disk"
-    create_partition $database_disk
-
     info "Creating $storage_fs filesystem"
     create_filesystem $database_disk $storage_fs
 

uyuni/uyuni-storage-setup/scripts/susemanager-storage-setup-functions.sh

@@ -30,7 +30,9 @@ linux_device() {
     test -z "$1" && die "linux_device called without argument"
     local device=$(readlink $1 2>/dev/null)
     if [ -z "$device" ];then
-        echo $1
+        device=$(basename $1)
+        device=/dev/$device
+        echo $device
         return
     fi
     device=$(basename $device)
@@ -65,8 +67,6 @@ is_btrfs_subvolume() {
     return 1
 }
 
-
-
 check_mountpoint() {
     test -z "$1" && die "check_mountpoint called without argument"
     local mount_point=${1%/}
@@ -94,22 +94,14 @@ get_first_partition_device() {
         echo $partition
         return
     fi
-    # If we are not on NVMe it just shows up as a scsi device
-    echo ${device}1
-}
-
-create_partition() {
-    test -z "$1" && die "create_parition called without argument"
-    local disk=$1
-    local result=$(parted -s $disk mklabel GPT 2>&1)
-    if [ $? != 0 ]; then
-        die "Creating new GPT label failed: $result"
-    fi
-    local result=$(parted -s $disk mkpart primary 2048s 100% 2>&1)
-    if [ $? != 0 ]; then
-        die "Partition setup failed: $result"
+    # If we are not on NVMe it may be a scsi device
+    partition=${device}1
+    if [ -e $partition ]; then
+        echo $partition
+        return
     fi
-    rm -f $cmd_sequence
+    # no partition available, FS might be directly on the block device
+    echo ${device}
 }
 
 create_filesystem() {

uyuni/uyuni-storage-setup/uyuni-storage-setup.changes.oholecek.no-partition-for-storage

@@ -0,0 +1 @@
+- do not create partition on extra storage disk