diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-15 13:49:39 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-15 13:49:56 -0200 |
| commit | c39f90469807f9c67c3b23319392d01587162719 (patch) | |
| tree | b1b5c2ac1f3cad7def5bd5887d79129c12510fea /usr.sbin/bsdinstall/scripts | |
| parent | 79e982f6961c72f665d8d3e7345e3236fb7900e2 (diff) | |
| download | FreeBSD-src-c39f90469807f9c67c3b23319392d01587162719.zip FreeBSD-src-c39f90469807f9c67c3b23319392d01587162719.tar.gz | |
Really fix #6929 for CE and factory
Diffstat (limited to 'usr.sbin/bsdinstall/scripts')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/config | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config index 32c7de9..c383052 100755 --- a/usr.sbin/bsdinstall/scripts/config +++ b/usr.sbin/bsdinstall/scripts/config @@ -37,15 +37,22 @@ rm $BSDINSTALL_TMPETC/sysctl.conf* cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc +# Copy pfSense loader.conf +if [ -f $BSDINSTALL_TMPBOOT/loader.conf ]; then + cp $BSDINSTALL_TMPBOOT/loader.conf \ + $BSDINSTALL_TMPBOOT/loader.conf.pfSense +fi cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf rm $BSDINSTALL_TMPBOOT/loader.conf.* -df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> /tmp/loader.conf.pfSense -#cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot +cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot + if [ -f /tmp/loader.conf.pfSense ]; then cp /tmp/loader.conf.pfSense $BSDINSTALL_CHROOT/boot/loader.conf fi +df -t zfs $BSDINSTALL_CHROOT > /dev/null && echo "zfs_load=\"YES\"" >> $BSDINSTALL_CHROOT/boot/loader.conf + if [ -f /tmp/boot.config ]; then cp /tmp/boot.conf $BSDINSTALL_CHROOT fi |
