summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xPCBSD/pc-sysinstall/backend-query/test-live.sh2
-rw-r--r--PCBSD/pc-sysinstall/backend/functions-cleanup.sh2
-rw-r--r--PCBSD/pc-sysinstall/changes.txt3
3 files changed, 5 insertions, 2 deletions
diff --git a/PCBSD/pc-sysinstall/backend-query/test-live.sh b/PCBSD/pc-sysinstall/backend-query/test-live.sh
index 67ec7a5..539f774 100755
--- a/PCBSD/pc-sysinstall/backend-query/test-live.sh
+++ b/PCBSD/pc-sysinstall/backend-query/test-live.sh
@@ -2,7 +2,7 @@
# Script which checks if we are running from install media, or real system
#############################################################################
-dmesg | grep "md0: Preloaded image" >/dev/null 2>/dev/null
+mount | grep "/dev/iso9660/pfSense" >/dev/null 2>/dev/null
if [ "$?" = "0" ]
then
echo "INSTALL-MEDIA"
diff --git a/PCBSD/pc-sysinstall/backend/functions-cleanup.sh b/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
index 2c7ffd0..16e0bd8 100644
--- a/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
+++ b/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
@@ -77,7 +77,7 @@ zfs_cleanup_unmount()
rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}"
sleep 2
fi
- done
+ done
fi
done
diff --git a/PCBSD/pc-sysinstall/changes.txt b/PCBSD/pc-sysinstall/changes.txt
new file mode 100644
index 0000000..031bac8
--- /dev/null
+++ b/PCBSD/pc-sysinstall/changes.txt
@@ -0,0 +1,3 @@
+PCBSD -> pfSense changes
+
+# Modified test-live to use mount | grep "/dev/iso9660/pfSense" >/dev/null 2>/dev/null
OpenPOWER on IntegriCloud