Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Apr 2021 09:23:47 GMT
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: cd17774d30c6 - main - rc: remove the 'addswap' script.
Message-ID:  <202104260923.13Q9Nl2X006065@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by trasz:

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

commit cd17774d30c6cb70643c694ddf5a11f3c795dec8
Author:     Edward Tomasz Napierala <trasz@FreeBSD.org>
AuthorDate: 2021-04-26 09:17:31 +0000
Commit:     Edward Tomasz Napierala <trasz@FreeBSD.org>
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104260923.13Q9Nl2X006065>