aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/usr/local/etc/poudriere.d/pkglist.pkg_repository1
-rw-r--r--scripts/hostclass/laptop/20-laptop12
-rw-r--r--scripts/hostclass/pkg_repository2
-rw-r--r--scripts/os/freebsd/50-idm3
-rw-r--r--vars/hostname/rlaptop12
5 files changed, 16 insertions, 4 deletions
diff --git a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
index 2c7250a..6fcac55 100644
--- a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
@@ -117,6 +117,7 @@ net/rsync
net/socat
net/syncthing
net/turnserver
+net/wifi-firmware-iwlwifi-kmod@all
net/wireguard-tools
ports-mgmt/pkg
ports-mgmt/poudriere
diff --git a/scripts/hostclass/laptop/20-laptop b/scripts/hostclass/laptop/20-laptop
index ce4a065..4e87fdb 100644
--- a/scripts/hostclass/laptop/20-laptop
+++ b/scripts/hostclass/laptop/20-laptop
@@ -36,6 +36,16 @@ case ${wireless_type:-} in
sysrc -v wlans_iwm0='wlan0'
;;
+ iwlwifi*)
+ set_loader_conf \
+ devmatch_blocklist="if_iwm" \
+ compat.linuxkpi.iwlwifi_11n_disable="0" \
+ compat.linuxkpi.iwlwifi_disable_11ac="0"
+
+ sysrc -v wlans_iwlwifi0='wlan0'
+
+ pkg install "wifi-firmware-iwlwifi-kmod-${wireless_type#iwlwifi}"
+ ;;
esac
# Enable power saving for sound card.
@@ -43,7 +53,7 @@ set_sysctl hw.snd.latency=7
# Configure wireless card.
sysrc -v \
- create_args_wlan0='country US regdomain FCC' \
+ create_args_wlan0='wlanmode sta country US regdomain FCC' \
ifconfig_wlan0="WPA DHCP powersave"
# Hardware-specific fixes.
diff --git a/scripts/hostclass/pkg_repository b/scripts/hostclass/pkg_repository
index 872320b..4be5d1d 100644
--- a/scripts/hostclass/pkg_repository
+++ b/scripts/hostclass/pkg_repository
@@ -1,6 +1,6 @@
#!/bin/sh
-: ${poudriere_versions:='14.2-RELEASE'}
+: ${poudriere_versions:='14.3-RELEASE'}
: ${poudriere_jobs:="$nproc"}
: ${poudriere_dataset:="${state_dataset:-zroot}"}
: ${poudriere_make_jobs_number:='4'}
diff --git a/scripts/os/freebsd/50-idm b/scripts/os/freebsd/50-idm
index 8c8cac3..828e18f 100644
--- a/scripts/os/freebsd/50-idm
+++ b/scripts/os/freebsd/50-idm
@@ -12,12 +12,13 @@ pkg install -y \
cyrus-sasl-gssapi \
nss-pam-ldapd-sasl \
openldap26-client \
- pam_krb5-mit \
perl5 \
p5-perl-ldap \
p5-Authen-SASL \
pam_mkhomedir
+pkg install -y pam_krb5-mit || pkg install -y pam_krb5
+
# Script to create /usr/local/home/${USER} on login.
install_file -m 0555 /usr/local/libexec/pam-create-local-homedir
diff --git a/vars/hostname/rlaptop1 b/vars/hostname/rlaptop1
index b9bef40..1ec979a 100644
--- a/vars/hostname/rlaptop1
+++ b/vars/hostname/rlaptop1
@@ -1,7 +1,7 @@
#!/bin/sh
pf_egress_interfaces='wlan0 em0 ue0'
-wireless_type=iwm8265
+wireless_type=iwlwifi8000
console_font=spleen-12x24
laptop_type=thinkpad
vt_suspendswitch=0