From 26e50f43459d09e319b90ccbb675f0a3bdbfe4be Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 22 May 2010 23:02:10 -0400
Subject: Adding changes file describing changes made so that installer works
 with pfSense in hopes of getting changes made upstream to accomidate both. 
 Change test-live.sh to detect /dev/iso9660/pfSense

---
 PCBSD/pc-sysinstall/backend-query/test-live.sh   | 2 +-
 PCBSD/pc-sysinstall/backend/functions-cleanup.sh | 2 +-
 PCBSD/pc-sysinstall/changes.txt                  | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 PCBSD/pc-sysinstall/changes.txt

(limited to 'PCBSD/pc-sysinstall')

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
-- 
cgit v1.1