CVS commit: pkgsrc/pkgtools/rc.d-boot

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Apr 15 20:25:07 UTC 2024

Modified Files:
        pkgsrc/pkgtools/rc.d-boot: INSTALL Makefile PLIST
        pkgsrc/pkgtools/rc.d-boot/files: org.pkgsrc.rc.d-boot.plist
Added Files:
        pkgsrc/pkgtools/rc.d-boot/files: rc.d-boot-fg rc.d-boot-pause.c

Log Message:
rc.d-boot: update to 20240415. Changes for macOS:

- Compatibility with older launchd: don't rely on LaunchOnlyOnce,
  instead add rc.d-boot-fg that stays foregrounded
- Compatibility with pre-FileVault Tolerate fdesetup not being present (i.e., pre-FileVault)

Tested on 10.4 (Tiger) and 14.4.1 (Sonoma).


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/rc.d-boot/INSTALL
cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/rc.d-boot/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/rc.d-boot/PLIST
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/pkgtools/rc.d-boot/files/org.pkgsrc.rc.d-boot.plist
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-fg \
    pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-pause.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/rc.d-boot/INSTALL
diff -u pkgsrc/pkgtools/rc.d-boot/INSTALL:1.8 pkgsrc/pkgtools/rc.d-boot/INSTALL:1.9
--- pkgsrc/pkgtools/rc.d-boot/INSTALL:1.8       Wed May 10 19:22:33 2023
+++ pkgsrc/pkgtools/rc.d-boot/INSTALL   Mon Apr 15 20:25:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.8 2023/05/10 19:22:33 schmonz Exp $
+# $NetBSD: INSTALL,v 1.9 2024/04/15 20:25:07 schmonz Exp $
 
 RCDBOOT_STYLE=@RCDBOOT_STYLE@
 RCD_SCRIPTS_DIR=@RCD_SCRIPTS_DIR@
@@ -27,7 +27,7 @@ POST-INSTALL)
                else
                        launchctl load -w /Library/LaunchDaemons/org.pkgsrc.rc.d-boot.plist
                fi
-               if fdesetup status | awk '{print $3}' | grep -q '^On\.$'; then
+               if ( fdesetup status 2>/dev/null || true ) | awk '{print $3}' | grep -q '^On\.$'; then
                        warning_filevault
                fi
                ;;

Index: pkgsrc/pkgtools/rc.d-boot/Makefile
diff -u pkgsrc/pkgtools/rc.d-boot/Makefile:1.15 pkgsrc/pkgtools/rc.d-boot/Makefile:1.16
--- pkgsrc/pkgtools/rc.d-boot/Makefile:1.15     Wed May 10 19:22:33 2023
+++ pkgsrc/pkgtools/rc.d-boot/Makefile  Mon Apr 15 20:25:07 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2023/05/10 19:22:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2024/04/15 20:25:07 schmonz Exp $
 #
 
-PKGNAME=               rc.d-boot-20230510
+PKGNAME=               rc.d-boot-20240415
 CATEGORIES=            pkgtools
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
@@ -22,15 +22,17 @@ RCORDER=            ${PREFIX}/sbin/rcorder
 .endif
 
 NO_CHECKSUM=           yes
-NO_BUILD=              yes
+BUILD_TARGET=          rc.d-boot-pause
+MAKE_FILE=             /dev/null
+USE_TOOLS+=            true:run
 
 SUBST_CLASSES=         paths
 SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     rc.d-boot
+SUBST_FILES.paths=     rc.d-boot rc.d-boot-fg
 SUBST_FILES.paths+=    org.pkgsrc.rc.d-boot.plist \
                        pkgsrc-rc.d-boot \
                        pkgsrc-rc.d-boot.service
-SUBST_VARS.paths=      GREP SYSCONFBASE PKGNAME PREFIX RCD_SCRIPTS_DIR RCORDER VARBASE
+SUBST_VARS.paths=      GREP SYSCONFBASE PKGNAME PREFIX RCD_SCRIPTS_DIR RCORDER TRUE VARBASE
 
 FILES_SUBST+=          RCDBOOT_STYLE=${RCDBOOT_STYLE:Q}
 FILES_SUBST+=          RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR:Q}
@@ -93,6 +95,8 @@ do-install:
 .for i in pkgsrc-rc.d-boot
        ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${EGDIR}/
 .endfor
-       ${INSTALL_SCRIPT} ${WRKSRC}/rc.d-boot ${DESTDIR}${PREFIX}/sbin/
+.for i in rc.d-boot rc.d-boot-fg rc.d-boot-pause
+       ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/sbin/
+.endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/pkgtools/rc.d-boot/PLIST
diff -u pkgsrc/pkgtools/rc.d-boot/PLIST:1.3 pkgsrc/pkgtools/rc.d-boot/PLIST:1.4
--- pkgsrc/pkgtools/rc.d-boot/PLIST:1.3 Fri Dec 28 20:24:02 2018
+++ pkgsrc/pkgtools/rc.d-boot/PLIST     Mon Apr 15 20:25:07 2024
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2018/12/28 20:24:02 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/04/15 20:25:07 schmonz Exp $
 sbin/rc.d-boot
+sbin/rc.d-boot-fg
+sbin/rc.d-boot-pause
 share/examples/rc.d-boot/org.pkgsrc.rc.d-boot.plist
 share/examples/rc.d-boot/pkgsrc-rc.d-boot
 share/examples/rc.d-boot/pkgsrc-rc.d-boot.service

Index: pkgsrc/pkgtools/rc.d-boot/files/org.pkgsrc.rc.d-boot.plist
diff -u pkgsrc/pkgtools/rc.d-boot/files/org.pkgsrc.rc.d-boot.plist:1.2 pkgsrc/pkgtools/rc.d-boot/files/org.pkgsrc.rc.d-boot.plist:1.3
--- pkgsrc/pkgtools/rc.d-boot/files/org.pkgsrc.rc.d-boot.plist:1.2      Thu Jan 16 16:47:32 2020
+++ pkgsrc/pkgtools/rc.d-boot/files/org.pkgsrc.rc.d-boot.plist  Mon Apr 15 20:25:07 2024
@@ -10,15 +10,13 @@
        <string>org.pkgsrc.rc.d-boot</string>
        <key>ProgramArguments</key>
        <array>
-               <string>@PREFIX@/sbin/rc.d-boot</string>
+               <string>@PREFIX@/sbin/rc.d-boot-fg</string>
                <string>start</string>
        </array>
        <key>OnDemand</key>
        <false/>
        <key>KeepAlive</key>
        <false/>
-       <key>LaunchOnlyOnce</key>
-       <true/>
        <key>StandardOutPath</key>
        <string>@VARBASE@/log/pkgsrc-rc.d-boot.out</string>
        <key>StandardErrorPath</key>

Added files:

Index: pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-fg
diff -u /dev/null pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-fg:1.1
--- /dev/null   Mon Apr 15 20:25:07 2024
+++ pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-fg        Mon Apr 15 20:25:07 2024
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+main() {
+       @PREFIX@/sbin/rc.d-boot "$@" || @TRUE@
+       exec @PREFIX@/sbin/rc.d-boot-pause
+}
+
+main "$@"
+exit $?
Index: pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-pause.c
diff -u /dev/null pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-pause.c:1.1
--- /dev/null   Mon Apr 15 20:25:07 2024
+++ pkgsrc/pkgtools/rc.d-boot/files/rc.d-boot-pause.c   Mon Apr 15 20:25:07 2024
@@ -0,0 +1,5 @@
+#include <unistd.h>
+
+int main(void) {
+       return pause();
+}