Merge pull request #1036 from aschnell/master

also mask swap units in mask-systemd-units
yast · Jan 29, 2020 · fdfd042 · fdfd042
2 parents f08be21 + 9a4f049
commit fdfd042
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 28 20:20:50 CET 2020 - aschnell@suse.com
+
+- also mask swap units in mask-systemd-units (bsc#1152545)
+- 4.2.79
+
 -------------------------------------------------------------------
 Fri Jan 24 14:08:28 CET 2020 - aschnell@suse.com
 

diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-storage-ng
-Version:        4.2.78
+Version:        4.2.79
 Release:        0
 Summary:        YaST2 - Storage Configuration
 License:        GPL-2.0-only OR GPL-3.0-only

diff --git a/src/bin/mask-systemd-units b/src/bin/mask-systemd-units
@@ -23,9 +23,10 @@ query_units()
 	fi
 
 	# skip mount points below /dev, /run, /proc and /sys since these are
-	# usually not on block devices and masking them could maybe lead to
-	# problems
-	if [[ $unit == dev-* || $unit == run-* || $unit == proc-* || $unit == sys-* ]] ; then
+	# usually not on block devices (e.g. dev-hugepages.mount) and masking
+	# them could maybe lead to problems
+	if [[ $unit == dev-*.mount || $unit == run-*.mount || $unit == proc-*.mount ||
+	      $unit == sys-*.mount ]] ; then
 	   continue
 	fi
 
@@ -40,6 +41,7 @@ mask_units()
     query_units | /usr/bin/xargs --verbose --no-run-if-empty --delimiter='\n' /usr/bin/systemctl --runtime $1 --
 }
 
+
 usage()
 {
     echo "Usage: $0 --mask/--unmask" 1>&2