summaryrefslogtreecommitdiffstats
path: root/build/scripts
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-08-03 07:34:48 -0300
committerRenato Botelho <renato@netgate.com>2016-08-03 07:34:48 -0300
commiteac7a83c7025d5fd8accd8c07eca4e7c6d3bc1a4 (patch)
tree683a9befa28c33f465aa7a988f36fe28695f2d65 /build/scripts
parent122afc756d1c6cfbc86e4a859e0a08401f452d6d (diff)
downloadpfsense-eac7a83c7025d5fd8accd8c07eca4e7c6d3bc1a4.zip
pfsense-eac7a83c7025d5fd8accd8c07eca4e7c6d3bc1a4.tar.gz
Do not include rescue on installation media
Diffstat (limited to 'build/scripts')
-rwxr-xr-xbuild/scripts/install_freebsd.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/scripts/install_freebsd.sh b/build/scripts/install_freebsd.sh
index 48d92ab..dc1c558 100755
--- a/build/scripts/install_freebsd.sh
+++ b/build/scripts/install_freebsd.sh
@@ -37,7 +37,7 @@ Options:
-s srcdir -- Path to src directory
-d destdir -- Destination directory to install
-o objdir -- Obj directory used to build
- -i -- Include BSDInstall
+ -i -- Install system for installation media
-W -- Skip installworld
-K -- Skip installkernel
-D -- Skip distribution
@@ -56,7 +56,7 @@ END
exit 1
}
-unset with_bsdinstall
+unset installation_media
unset skip_world
unset skip_kernel
unset skip_distribution
@@ -73,7 +73,7 @@ while getopts s:d:o:iWKDhz opt; do
objdir=$OPTARG
;;
i)
- with_bsdinstall=1
+ installation_media=1
;;
W)
skip_world=1
@@ -133,8 +133,8 @@ j="-j${njobs}"
[ -n "${objdir}" ] \
&& export MAKEOBJDIRPREFIX=${objdir}
-[ -z "${with_bsdinstall}" ] \
- && export WITHOUT_BSDINSTALL=yes
+[ -z "${installation_media}" ] \
+ && export WITHOUT_BSDINSTALL=yes WITHOUT_RESCUE=yes
export DESTDIR=${destdir}
@@ -157,7 +157,7 @@ fi
&& run "Installing distribution" \
"${make_cmd} distribution"
-[ -n "${with_bsdinstall}" ] \
+[ -n "${installation_media}" ] \
&& run "Copying /etc/rc.local to start bsdinstall" \
"cp ${srcdir}/release/rc.local ${destdir}/etc"
OpenPOWER on IntegriCloud