diff --git a/tests/ci/tools/ci.conf b/tests/ci/tools/ci.conf --- a/tests/ci/tools/ci.conf +++ b/tests/ci/tools/ci.conf @@ -37,7 +37,6 @@ test_suites.FreeBSD.cam_test_device = '/dev/ada0' test_suites.FreeBSD.disks = '/dev/vtbd2 /dev/vtbd3 /dev/vtbd4 /dev/vtbd5 /dev/vtbd6' EOF -cat << EOF >> ${DESTDIR}/etc/rc.conf kld_list="" # Load modules needed by tests kld_list="${kld_list} blake2" # sys/opencrypto kld_list="${kld_list} cryptodev" # sys/opencrypto @@ -55,21 +54,14 @@ kld_list="${kld_list} dummynet" # sys/netpfil/common kld_list="${kld_list} carp" # sys/netinet/carp kld_list="${kld_list} if_stf" # sys/net/if_stf -background_fsck="NO" -sendmail_enable="NONE" -cron_enable="NO" -syslogd_enable="NO" -newsyslog_enable="NO" -EOF -if [ "${CITYPE}" = "smoke" ]; then -cat << EOF >> ${DESTDIR}/etc/rc.conf -freebsdci_type="smoke" -EOF -elif [ "${CITYPE}" = "full" ]; then -cat << EOF >> ${DESTDIR}/etc/rc.conf -freebsdci_type="full" -EOF -fi +sysrc -f ${DESTDIR}/etc/rc.conf \ + kld_list="${kld_list}" \ + background_fsck="NO" \ + sendmail_enable="NONE" \ + cron_enable="NO" \ + syslogd_enable="NO" \ + newsyslog_enable="NO" \ + freebsdci_type="${CITYPE}" cat << EOF >> ${DESTDIR}/etc/sysctl.conf kern.cryptodevallowsoft=1 kern.ipc.tls.enable=1