git: 4a10f984d8e5 - stable/13 - OptionalObsoleteFiles.inc: Add rc.d/zfskeys

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Mateusz Piotrowski <0mp_at_FreeBSD.org>
Date: Mon, 06 Dec 2021 09:57:28 UTC

The branch stable/13 has been updated by 0mp (doc, ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=4a10f984d8e54d5115574d1ed354264921dfb2d3

commit 4a10f984d8e54d5115574d1ed354264921dfb2d3
Author:     Herbert J. Skuhra <herbert@gojira.at>
AuthorDate: 2021-12-03 00:44:55 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-12-06 09:56:28 +0000

    OptionalObsoleteFiles.inc: Add rc.d/zfskeys
    
    While here, sort the etc/rc.d entries.
    
    PR:             256483
    Reviewed by:    allanjude
    Approved by:    allanjude (src)
    MFC after:      3 days
    Sponsored by:   Modirum MDPay
    Sponsored by:   Klara Inc.
    Differential Revision:  https://reviews.freebsd.org/D33238
    
    (cherry picked from commit a58135eb092748caf383bc82306af522ff311d9d)
---
 tools/build/mk/OptionalObsoleteFiles.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index ea42479a2d69..26a3861f736a 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1120,8 +1120,9 @@ OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=etc/rc.d/zfs
-OLD_FILES+=etc/rc.d/zfsd
 OLD_FILES+=etc/rc.d/zfsbe
+OLD_FILES+=etc/rc.d/zfsd
+OLD_FILES+=etc/rc.d/zfskeys
 OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs