diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-04 14:05:12 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-04 14:05:52 -0200 |
| commit | 79fc6b47a08efeaf6fb306050a37f13b405bb8ce (patch) | |
| tree | 1fedf468c645d4f3fd2278c119670962e965a241 /usr.sbin/bsdinstall | |
| parent | 13d5cdea6793d075c6b282ece47192e6482cb9f1 (diff) | |
| download | FreeBSD-src-79fc6b47a08efeaf6fb306050a37f13b405bb8ce.zip FreeBSD-src-79fc6b47a08efeaf6fb306050a37f13b405bb8ce.tar.gz | |
Do not replace sysctl.conf or /boot/* on target system
Diffstat (limited to 'usr.sbin/bsdinstall')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config index 8cd0f17..f80b2e2 100755 --- a/usr.sbin/bsdinstall/scripts/config +++ b/usr.sbin/bsdinstall/scripts/config @@ -33,7 +33,7 @@ #rm $BSDINSTALL_TMPETC/rc.conf.* cat $BSDINSTALL_CHROOT/etc/sysctl.conf $BSDINSTALL_TMPETC/sysctl.conf.hardening >> $BSDINSTALL_TMPETC/sysctl.conf -rm $BSDINSTALL_TMPETC/sysctl.conf.* +rm $BSDINSTALL_TMPETC/sysctl.conf* cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc @@ -41,7 +41,7 @@ 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\"" >> $BSDINSTALL_TMPBOOT/loader.conf -cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot +#cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot [ "${debugFile#+}" ] && cp "${debugFile#+}" $BSDINSTALL_CHROOT/var/log/ |
