Merge pull request #2063 from phillxnet/2062_openSUSE_improve_JeOS_co…

…mpatability_re_ROOT_label [openSUSE] improve JeOS compatibility re ROOT label. Fixes #2062
rockstor · Sep 22, 2019 · 9557493 · 9557493
2 parents 281bd29 + 3e6e749
commit 9557493
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/conf/settings.conf.in b/conf/settings.conf.in
@@ -279,7 +279,7 @@ SFTP_MNT_ROOT = '/mnt3/'
 
 # System volume label when no btrfs volume label is set as per default openSUSE
 # install: ie 'btrfs fi show' gives 'Label: none'
-SYS_VOL_LABEL = 'system'
+SYS_VOL_LABEL = 'ROOT'
 
 TAP_DIR = '${django-settings-conf:taplib}'
 TAP_SERVER = ('127.0.0.1', ${django-settings-conf:tapport})

diff --git a/conf/test-settings.conf.in b/conf/test-settings.conf.in
@@ -266,7 +266,7 @@ SFTP_MNT_ROOT = '/mnt3/'
 
 # System volume label when no btrfs volume label is set as per default openSUSE
 # install: ie 'btrfs fi show' gives 'Label: none'
-SYS_VOL_LABEL = 'system'
+SYS_VOL_LABEL = 'ROOT'
 
 TAP_DIR = '${django-settings-conf:taplib}'
 TAP_SERVER = ('127.0.0.1', ${django-settings-conf:tapport})

diff --git a/src/rockstor/storageadmin/views/disk.py b/src/rockstor/storageadmin/views/disk.py
@@ -324,7 +324,8 @@ def _update_disk_state():
                 # TODO: First call we reset none pool label member count times!
                 # Corner case but room for efficiency improvement.
                 # Consider building a list of pools relabeled to address issue.
-                if pool_name == 'none':
+                # N.B. 'system' for early source to rpm installs - openSUSE
+                if pool_name == 'none' or pool_name == 'system':
                     pool_name = set_pool_label(p_info.uuid, dev_name, d.root)
                 # Update our disk database entry with btrfs specific data.
                 dob.devid = p_info.devid