3 files changed, 39 insertions, 19 deletions
diff --git a/scripts/hostclass/laptop b/scripts/hostclass/laptop
index 83c7457..58dfa7f 100644
--- a/scripts/hostclass/laptop
+++ b/scripts/hostclass/laptop
@@ -9,7 +9,36 @@ install_file -m 0555 /usr/local/libexec/lid-close
 install_file -m 0644 /etc/devd/lid-close.conf
 service devd restart
 
+case ${wireless_type:-} in
+  iwm*)
+    set_loader_conf \
+      if_iwm_load=YES \
+      "${wireless_type}fw_load=YES"
+
+    load_kernel_module \
+      if_iwm \
+      "${wireless_type}fw"
+
+    sysrc -v wlans_iwm0='wlan0'
+    ;;
+esac
+
 # Configure wireless card.
 sysrc -v \
   create_args_wlan0='country US regdomain FCC' \
   ifconfig_wlan0="WPA DHCP powersave"
+
+# On some graphics cards, kern.vt.suspendswitch=1 (the default) breaks graphics
+# acceleration after resuming from sleep.
+set_sysctl kern.vt.suspendswitch="${vt_suspendswitch:-1}"
+
+# Hardware-specific fixes.
+case ${laptop_type:-} in
+  thinkpad)
+    # Set brightness using function keys.
+    set_sysctl dev.acpi_ibm.0.handlerevents='0x10 0x11'
+    install_file -m 0555 /usr/local/libexec/thinkpad-brightness
+    install_file -m 0644 /etc/devd/thinkpad-brightness.conf
+    service devd restart
+    ;;
+esac
diff --git a/scripts/hostname/rlaptop1 b/scripts/hostname/rlaptop1
index 874c9dd..b1c9865 100644
--- a/scripts/hostname/rlaptop1
+++ b/scripts/hostname/rlaptop1
@@ -1,21 +1,8 @@
 #!/bin/sh
 
-set_loader_conf \
-  if_iwm_load=YES \
-  iwm8265fw_load=YES
-
-sysrc -v wlans_iwm0='wlan0'
-
-# On this laptop, kern.vt.suspendswitch=1 (the default) breaks graphics
-# acceleration after resuming from sleep.
-set_sysctl \
-  dev.acpi_ibm.0.handlerevents='0x10 0x11' \
-  kern.vt.suspendswitch=0
-
-install_file -m 0555 /usr/local/libexec/thinkpad-brightness
-install_file -m 0644 /etc/devd/thinkpad-brightness.conf
-
-service devd restart
-
-pw usershow cullum || \
-  pw useradd cullum -c "Cullum Smith" -d /home/cullum -G wheel,operator,video -s /bin/sh -m -M 700
+add_local_user \
+  -c "Cullum Smith" \
+  -G wheel,operator,video \
+  -s /bin/sh \
+  -m \
+  cullum
diff --git a/scripts/os/freebsd/10-rc-conf b/scripts/os/freebsd/10-rc-conf
index a8a3d22..629c72b 100644
--- a/scripts/os/freebsd/10-rc-conf
+++ b/scripts/os/freebsd/10-rc-conf
@@ -5,3 +5,7 @@ sysrc -v \
   dumpdev=NO \
   ipv6_activate_all_interfaces=NO \
   syslogd_flags=-ss
+
+if [ -n "${console_font:-}" ]; then
+  sysrc -v allscreens_flags="-f ${console_font}"
+fi