summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-07-31 15:13:15 -0300
committerRenato Botelho <renato@netgate.com>2015-07-31 15:13:15 -0300
commite520b4e33d664209d9533f3900f6317ab8f44750 (patch)
tree6711a90728ec5a13774b0c7ecceec6e8cb9bfc64
parent70497688eb07bf787c0ebe7cb8bb7df6e5b1235d (diff)
downloadpfsense-e520b4e33d664209d9533f3900f6317ab8f44750.zip
pfsense-e520b4e33d664209d9533f3900f6317ab8f44750.tar.gz
Use /cf/conf to populate default config on cdrom since it is always present, /conf is a synlink
-rwxr-xr-xetc/rc.cdrom10
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/rc.cdrom b/etc/rc.cdrom
index 9169871..5e8d80f 100755
--- a/etc/rc.cdrom
+++ b/etc/rc.cdrom
@@ -3,7 +3,7 @@
# rc.cdrom - livedisc specific routines
# For pfSense
-# Size of memory file system /conf /home partitions
+# Size of memory file system /cf/conf partition
partsize="6m"
export VARMFS_COPYDBPKG=yes
@@ -18,15 +18,14 @@ done
/bin/sh /scripts/pfi start
# If PFI did not find a config, we should create
-# a tiny mfs under /conf and populate with stock
+# a tiny mfs under /cf/conf and populate with stock
# configuration.
if [ ! -f /conf/config.xml ]; then
echo -n "Generating a MFS /conf partition... "
device=$(mdconfig -a -t malloc -s ${partsize})
newfs /dev/${device} > /dev/null 2>&1
- mount /dev/${device} /conf
- cp /conf.default/* /conf
- mount_nullfs /conf /cf/conf
+ mount /dev/${device} /cf/conf
+ cp /conf.default/* /cf/conf
echo "done."
fi
@@ -37,5 +36,4 @@ mount /dev/${device} /home
echo "done."
# Create some needed directories
-/bin/mkdir -p /var/db/pkg/
/bin/mkdir -p /var/tmp/vi.recover/
OpenPOWER on IntegriCloud