From: deraadt Date: Wed, 5 Jan 2022 16:35:33 +0000 (+0000) Subject: Use new shell-based fw_update(8) X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0046d86390290c02affb760f65815e40af5fdcf9;p=openbsd Use new shell-based fw_update(8) with afresh1 --- diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 893432f6778..fa19e3bc456 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1186 2021/12/07 04:13:22 deraadt Exp $ +# $OpenBSD: install.sub,v 1.1187 2022/01/05 16:35:35 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -2836,6 +2836,8 @@ finish_up() { ) echo " done." + [ -x /mnt/usr/sbin/fw_update ] && DESTDIR=/mnt /mnt/usr/sbin/fw_update + # We may run some programs in chroot, and some of them might be # dynamic. That is highly discouraged, but let us play it safe. rm -f /mnt/var/run/ld.so.hints @@ -2894,7 +2896,7 @@ finish_up() { quote export "http_proxy=$http_proxy" >>/mnt/etc/rc.firsttime # Ensure that fw_update is run on reboot. - echo "/usr/sbin/fw_update -v" >>/mnt/etc/rc.firsttime + echo "/usr/sbin/fw_update" >>/mnt/etc/rc.firsttime # Run syspatch -c on reboot if the arch is supported and if it is a # release system (not -stable or -current). List uninstalled syspatches diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 23be70ce983..112f71780e2 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.213 2021/11/11 09:52:24 claudio Exp $ +# $OpenBSD: Makefile,v 1.214 2022/01/05 16:35:33 deraadt Exp $ .include SUBDIR= ac accton acme-client acpidump adduser amd apm apmd arp \ authpf bgpctl bgpd btrace chroot config cron crunchgen dev_mkdb \ dhcpd dhcpleasectl dhcrelay dhcrelay6 dvmrpctl dvmrpd edquota eeprom \ - eigrpd eigrpctl fdformat ftp-proxy gpioctl hostapd hostctl hotplugd \ - httpd identd ifstated ikectl inetd installboot iostat iscsictl iscsid \ - kgmon kvm_mkdb ldapd ldapctl ldomctl ldomd ldpd ldpctl lpr makefs \ - mailwrapper map-mbone memconfig mksuncd mkuboot mopd mrinfo \ - mrouted mtrace mtree ndp netgroup_mkdb \ + eigrpd eigrpctl fdformat ftp-proxy fw_update gpioctl hostapd hostctl \ + hotplugd httpd identd ifstated ikectl inetd installboot iostat \ + iscsictl iscsid kgmon kvm_mkdb ldapd ldapctl ldomctl ldomd \ + ldpd ldpctl lpr makefs mailwrapper map-mbone memconfig mksuncd \ + mkuboot mopd mrinfo mrouted mtrace mtree ndp netgroup_mkdb \ npppctl npppd nsd ntpd ocspcheck ospfctl ospfd ospf6d ospf6ctl \ pcidump pkg_add portmap pppd procmap pstat pwd_mkdb \ quot quotaon ractl rad radiusctl radiusd rarpd rbootd \ diff --git a/usr.sbin/pkg_add/Makefile b/usr.sbin/pkg_add/Makefile index f9bd0d4a62b..531919220fb 100644 --- a/usr.sbin/pkg_add/Makefile +++ b/usr.sbin/pkg_add/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.91 2020/12/20 15:30:58 daniel Exp $ +# $OpenBSD: Makefile,v 1.92 2022/01/05 16:35:35 deraadt Exp $ .include -MAN1=fw_update.1 pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 \ +MAN1=pkg_add.1 pkg_info.1 pkg_create.1 pkg_delete.1 \ pkg_mklocatedb.1 pkg_sign.1 MAN5=package.5 MAN8=pkg_check.8 @@ -83,8 +83,7 @@ SCRIPTS_LNK = \ pkg_add pkg_create \ pkg_add pkg_delete \ pkg_add pkg_info \ - pkg_add pkg_sign \ - pkg_add fw_update + pkg_add pkg_sign LIBBASE=/usr/libdata/perl5