remount-ro: nothing to do if device is already read-only

osresearch · May 20, 2020 · 0533d1d · 0533d1d
1 parent b0fdba7
commit 0533d1d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/sbin/safeboot b/sbin/safeboot
@@ -874,15 +874,17 @@ remount_ro()
 {
 	DEV="${1:-${ROOTDEV}}"
 
-	warn "${DEV}: remounting read-only"
+	if [ "$(blockdev --getro "${DEV}")" == 1 ] ; then
+		warn "${DEV}: already read-only"
+		return 0
+	fi
 
+	warn "${DEV}: remounting read-only"
 	if mount -o ro,noatime,remount "${DEV}" ; then
 
-		if [ "$(blockdev --getro "${DEV}")" != 1 ] ; then
-			warn "${DEV}: forcing fsck"
-			fsck.ext4 -f "${DEV}" \
-				|| die "${DEV}: Could not fsck"
-		fi
+		warn "${DEV}: forcing fsck"
+		fsck.ext4 -f "${DEV}" \
+			|| die "${DEV}: Could not fsck"
 
 		warn "${DEV}: setting block dev readonly"
 		blockdev --setro "${DEV}" \