From owner-dev-commits-src-main@freebsd.org Mon Apr 26 09:23:47 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5C0D5F9EC9; Mon, 26 Apr 2021 09:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTKFv57LHz58mm; Mon, 26 Apr 2021 09:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A2DF5249FF; Mon, 26 Apr 2021 09:23:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13Q9Nl36006066; Mon, 26 Apr 2021 09:23:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13Q9Nl2X006065; Mon, 26 Apr 2021 09:23:47 GMT (envelope-from git) Date: Mon, 26 Apr 2021 09:23:47 GMT Message-Id: <202104260923.13Q9Nl2X006065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: cd17774d30c6 - main - rc: remove the 'addswap' script. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd17774d30c6cb70643c694ddf5a11f3c795dec8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 09:23:47 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd17774d30c6cb70643c694ddf5a11f3c795dec8 commit cd17774d30c6cb70643c694ddf5a11f3c795dec8 Author: Edward Tomasz Napierala AuthorDate: 2021-04-26 09:17:31 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-04-26 09:22:47 +0000 rc: remove the 'addswap' script. It's been unused since 268a55bc98b. Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D29749 --- ObsoleteFiles.inc | 3 +++ libexec/rc/rc.d/Makefile | 1 - libexec/rc/rc.d/addswap | 24 ------------------------ 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6f4cf3e2b5da..4b66a3ecbb97 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,6 +40,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20210426: remove unused libexec/rc.d/addswap +OLD_FILES+=etc/rc.d/addswap + # 20210413: Remove pfctlinput2 OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 7b15cab40bb8..63dc17eceeaf 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -11,7 +11,6 @@ CONFS= DAEMON \ LOGIN \ NETWORKING \ SERVERS \ - addswap \ adjkerntz \ bgfsck \ ${_blacklistd} \ diff --git a/libexec/rc/rc.d/addswap b/libexec/rc/rc.d/addswap deleted file mode 100755 index 1758df8409a8..000000000000 --- a/libexec/rc/rc.d/addswap +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# Add additional swap files -# -# $FreeBSD$ -# - -# PROVIDE: addswap -# REQUIRE: FILESYSTEMS kld -# BEFORE: netif -# KEYWORD: nojail shutdown - -. /etc/rc.subr - -name="addswap" -start_cmd=":" -stop_cmd=":" -rcvar= - -set_rcvar_obsolete swapfile -set_rcvar_obsolete geli_swap_flags - -load_rc_config $name -run_rc_command "$1"