From 975b38c065517613fcb26b469ec148af2eef668c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 17 Mar 2022 07:57:33 +0100
Subject: [PATCH] system: shorten markers, drop "growfs" suffix

---
 src/etc/inc/util.inc       | 2 +-
 src/etc/rc                 | 2 +-
 src/sbin/opnsense-importer | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index 4440445c9..d2e465c12 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -1316,7 +1316,7 @@ function is_install_media()
      * Despite unionfs underneath, / is still not writeable,
      * making the following the perfect test for install media.
      */
-    $file = '/.probe.for.install.media';
+    $file = '/.probe.for.readonly';
 
     if (file_exists($file)) {
         return false;
diff --git a/src/etc/rc b/src/etc/rc
index 883fac045..6b02cd299 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -63,7 +63,7 @@ grow_partition()
 # tunefs may refuse otherwise
 mount -fr / 2> /dev/null
 
-GROWFS_MARKER=/.probe.for.growfs.nano
+GROWFS_MARKER=/.probe.for.growfs
 ROOT_IS_UFS=
 ROOT_IS_ZFS=$(
 	df -hT | while read FS TYPE SIZE USED AVAIL CAP MOUNT MORE; do
diff --git a/src/sbin/opnsense-importer b/src/sbin/opnsense-importer
index 0a78ec7d1..749550108 100755
--- a/src/sbin/opnsense-importer
+++ b/src/sbin/opnsense-importer
@@ -24,7 +24,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-INSTALL="/.probe.for.install.media"
+INSTALL="/.probe.for.readonly"
 MNT="/tmp/hdrescue"
 SHELL="/bin/sh"
 WAIT="........."