summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-05-23 00:58:25 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-05-23 00:58:25 -0400
commit8b3a495bac40fdf967d7c1984ec0dcf1996c14db (patch)
treee87e71eb238334a631a9c190cb262d9ac861ce51
parent89e47a070a6bb0b73fdd8ef59c25d9f7eecd4b0a (diff)
downloadpfsense-8b3a495bac40fdf967d7c1984ec0dcf1996c14db.zip
pfsense-8b3a495bac40fdf967d7c1984ec0dcf1996c14db.tar.gz
Make installer unionfs
-rw-r--r--PCBSD/pc-sysinstall/backend/functions-extractimage.sh2
-rwxr-xr-xetc/rc4
2 files changed, 4 insertions, 2 deletions
diff --git a/PCBSD/pc-sysinstall/backend/functions-extractimage.sh b/PCBSD/pc-sysinstall/backend/functions-extractimage.sh
index 09781e6..de2874f 100644
--- a/PCBSD/pc-sysinstall/backend/functions-extractimage.sh
+++ b/PCBSD/pc-sysinstall/backend/functions-extractimage.sh
@@ -32,7 +32,7 @@ start_extract_uzip_tar()
if [ "$?" != "0" ]
then
echo "CPDUP failure occured:" >>${LOGOUT}
- exit_err "ERROR: Error occured during cpdup"
+ exit_err "ERROR: Error occurred during cpdup"
fi
;;
uzip) # Start by mounting the uzip image
diff --git a/etc/rc b/etc/rc
index c7fa977..fa18488 100755
--- a/etc/rc
+++ b/etc/rc
@@ -112,7 +112,7 @@ if [ "$PLATFORM" = "cdrom" ] ; then
mkdir /tmp/unionfs/bin
mkdir /tmp/unionfs/boot
mkdir /tmp/unionfs/confdefault
- mkdir /tmp/unionfs/diskroot
+ mkdir /tmp/unionfs/PCBSD
echo -n "Mounting unionfs directories:"
echo -n " usr"
mount_unionfs /tmp/unionfs/usr /usr/
@@ -126,6 +126,8 @@ if [ "$PLATFORM" = "cdrom" ] ; then
mount_unionfs /tmp/unionfs/boot /boot/
echo -n " conf.default"
mount_unionfs /tmp/unionfs/confdefault /conf.default/
+ echo -n " installer"
+ mount_unionfs /tmp/unionfs/PCBSD /PCBSD/
echo "... done."
fi
OpenPOWER on IntegriCloud