diff options
| author | Cullum Smith <cullum@sacredheartsc.com> | 2024-10-16 21:18:49 -0400 |
|---|---|---|
| committer | Cullum Smith <cullum@sacredheartsc.com> | 2024-10-16 21:18:49 -0400 |
| commit | aa28ec7ef20517e994f01753e8c4e6fdd4d0643c (patch) | |
| tree | cea6c733c5e900f4ea54501ca7070694931124dc /scripts/os | |
| parent | 3c41d02428317d68ded5eb4fee5baf17f644a741 (diff) | |
| download | infrastructure-aa28ec7ef20517e994f01753e8c4e6fdd4d0643c.tar.gz | |
more desktop fixes
Diffstat (limited to 'scripts/os')
| -rw-r--r-- | scripts/os/freebsd/10-bootloader | 14 | ||||
| -rw-r--r-- | scripts/os/freebsd/10-rc-conf | 7 | ||||
| -rw-r--r-- | scripts/os/freebsd/51-autofs | 7 |
3 files changed, 21 insertions, 7 deletions
diff --git a/scripts/os/freebsd/10-bootloader b/scripts/os/freebsd/10-bootloader index 0506606..438acc0 100644 --- a/scripts/os/freebsd/10-bootloader +++ b/scripts/os/freebsd/10-bootloader @@ -13,11 +13,7 @@ kill -HUP 1 set_loader_conf \ autoboot_delay=1 \ beastie_disable=YES \ - boot_multicons=YES \ - boot_serial=YES \ cc_htcp_load=YES \ - console=comconsole,efi \ - comconsole_speed=115200 \ kern.geom.label.disk_ident.enable=0 \ kern.geom.label.gptid.enable=0 \ net.inet.tcp.soreceive_stream=1 \ @@ -27,3 +23,13 @@ set_loader_conf \ pf_load=YES \ pflog_load=YES \ security.bsd.allow_destructive_dtrace=0 + +if [ "${serial_console:-}" = true ]; then + # Don't enable the serial console for all hosts indiscriminately. + # Somehow, having the serial console enabled breaks ConsoleKit. + set_loader_conf \ + boot_multicons=YES \ + boot_serial=YES \ + console=comconsole,efi \ + comconsole_speed=115200 +fi diff --git a/scripts/os/freebsd/10-rc-conf b/scripts/os/freebsd/10-rc-conf index 629c72b..2d91005 100644 --- a/scripts/os/freebsd/10-rc-conf +++ b/scripts/os/freebsd/10-rc-conf @@ -1,11 +1,16 @@ #!/bin/sh sysrc -v \ - clear_tmp_enable=YES \ dumpdev=NO \ ipv6_activate_all_interfaces=NO \ syslogd_flags=-ss +if [ "$clear_tmp_enable" = false ]; then + sysrc -v clear_tmp_enable=NO +else + sysrc -v clear_tmp_enable=YES +fi + if [ -n "${console_font:-}" ]; then sysrc -v allscreens_flags="-f ${console_font}" fi diff --git a/scripts/os/freebsd/51-autofs b/scripts/os/freebsd/51-autofs index a4549c8..0ad814f 100644 --- a/scripts/os/freebsd/51-autofs +++ b/scripts/os/freebsd/51-autofs @@ -17,7 +17,7 @@ sysrc -v \ nfsuserd_flags="-usermax ${nfsuserd_cache_size} -usertimeout ${nfsuserd_cache_timeout} ${nfsuserd_num_servers}" \ gssd_enable=YES \ gssd_flags='-h -s /tmp' \ - gssd_env="KRB5_KTNAME=${keytab_dir}/host.keytab" + gssd_env="KRB5_KTNAME=${keytab_dir}/host.keytab" \ nfs_client_enable=YES \ nfscbd_enable=NO \ nfscbd_flags="-p ${nfscbd_port} -P host" \ @@ -28,6 +28,9 @@ install_file -m 0555 /usr/local/libexec/idm-autofs-map ln -snfv /usr/local/libexec/idm-autofs-map /etc/autofs/include # TODO: nfscbd causes kernel panics on FreeBSD 14.1, disabled for now. -for service in gssd nfsclient nfsuserd automount automountd autounmountd; do +for service in gssd nfsuserd automountd autounmountd; do service "$service" status || service "$service" start done + +service nfsclient start +service automount start |