From 3fedaccac07a74cf553e85d9d7ade7f7bcb04ee3 Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Thu, 13 Aug 2026 18:06:07 -0700
Subject: [PATCH] openbsd.rc: refresh boot phases patch for 7.9

---
 .../bsd/openbsd/pkgs/rc/boot-phases.patch     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch b/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch
index 5838905273a4..4c8fbaa98bb1 100644
--- a/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch
+++ b/pkgs/os-specific/bsd/openbsd/pkgs/rc/boot-phases.patch
@@ -7,7 +7,6 @@ also removes some of the parts of the boot script which are inappropriate for a
 nix-based system, for example, re-linking code objects and setting PATH.
 
 diff --git a/etc/rc b/etc/rc
-index 9d87fac8caf..581c1e3f4ab 100644
 --- a/etc/rc
 +++ b/etc/rc
 @@ -9,6 +9,10 @@ set +o sh
@@ -21,7 +20,7 @@ index 9d87fac8caf..581c1e3f4ab 100644
  # Strip in- and whole-line comments from a file.
  # Strip leading and trailing whitespace if IFS is set.
  # Usage: stripcom /path/to/file
-@@ -337,7 +341,6 @@ trap : 3	# Shouldn't be needed.
+@@ -359,7 +363,6 @@ trap : 3	# Shouldn't be needed.
  
  export HOME=/
  export INRC=1
@@ -29,7 +28,7 @@ index 9d87fac8caf..581c1e3f4ab 100644
  
  # /etc/myname contains my symbolic name.
  if [[ -f /etc/myname ]]; then
-@@ -413,17 +416,12 @@ fi
+@@ -431,17 +434,12 @@ fi
  # From now on, allow user to interrupt (^C) the boot process.
  trap "echo 'Boot interrupted.'; exit 1" 3
  
@@ -47,7 +46,7 @@ index 9d87fac8caf..581c1e3f4ab 100644
  
  rm -f /fastboot
  
-@@ -483,9 +481,9 @@ mount -s /var >/dev/null 2>&1		# cannot be on NFS
+@@ -503,9 +501,9 @@ mount -s /var >/dev/null 2>&1		# cannot be on NFS
  mount -s /var/log >/dev/null 2>&1	# cannot be on NFS
  mount -s /usr >/dev/null 2>&1		# if NFS, fstab must use IP address
  
@@ -59,31 +58,31 @@ index 9d87fac8caf..581c1e3f4ab 100644
  
  echo 'starting network'
  
-@@ -495,12 +493,10 @@ ifconfig -g carp carpdemote 128
+@@ -515,12 +513,10 @@ ifconfig -g carp carpdemote 128
  
  sh /etc/netstart
  
 -start_daemon unwind >/dev/null 2>&1
 +daemon_phase 30
  
- random_seed
+ store_random
  
 -wait_reorder_libs
 -
  # Load pf rules and bring up pfsync interface.
  if [[ $pf != NO ]]; then
  	if [[ -f /etc/pf.conf ]]; then
-@@ -522,8 +518,7 @@ dmesg >/var/run/dmesg.boot
+@@ -541,8 +537,7 @@ dmesg >/var/run/dmesg.boot
  make_keys
  
  echo -n 'starting early daemons:'
--start_daemon syslogd ldattach pflogd nsd unbound ntpd
+-start_daemon syslogd ldattach bpflogd pflogd nsd unbound ntpd
 -start_daemon iscsid isakmpd iked sasyncd ldapd npppd
 +daemon_phase 40
  echo '.'
  
  # Load IPsec rules.
-@@ -532,11 +527,7 @@ if [[ $ipsec != NO && -f /etc/ipsec.conf ]]; then
+@@ -551,11 +545,7 @@ if [[ $ipsec != NO && -f /etc/ipsec.conf ]]; then
  fi
  
  echo -n 'starting RPC daemons:'
@@ -96,13 +95,13 @@ index 9d87fac8caf..581c1e3f4ab 100644
  echo '.'
  
  # Check and mount remaining file systems and enable additional swap.
-@@ -626,43 +617,24 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover
+@@ -648,43 +637,24 @@ echo 'preserving editor files.'; /usr/libexec/vi.recover
  run_upgrade_script sysmerge
  
  echo -n 'starting network daemons:'
 -start_daemon ldomd sshd snmpd ldpd ripd ospfd ospf6d bgpd ifstated
 -start_daemon relayd dhcpd dhcrelay mrouted dvmrpd radiusd eigrpd route6d
--start_daemon rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd
+-start_daemon dhcp6leased rad hostapd lpd smtpd slowcgi bgplgd httpd ftpd
 -start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
 -start_daemon rbootd mopd vmd spamd spamlogd sndiod
 +daemon_phase 60