Page MenuHomeFreeBSD

D30631.diff
No OneTemporary

D30631.diff

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,6 +52,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20220307: remove 330.news
+OLD_FILES+=etc/periodic/daily/330.news
+
# 20220210: unwind.h moved to /usr/include
OLD_FILES+=usr/include/c++/v1/unwind-arm.h
OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 7, 2020
+.Dd March 7, 2022
.Dt PERIODIC.CONF 5
.Os
.Sh NAME
@@ -396,12 +396,6 @@
.Dq Li YES .
The default is
.Fl q .
-.It Va daily_news_expire_enable
-.Pq Vt bool
-Set to
-.Dq Li YES
-if you want to run
-.Pa /etc/news.expire .
.It Va daily_status_disks_enable
.Pq Vt bool
Set to
diff --git a/usr.sbin/periodic/etc/daily/330.news b/usr.sbin/periodic/etc/daily/330.news
deleted file mode 100755
--- a/usr.sbin/periodic/etc/daily/330.news
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Expire news articles
-# (This is present only for backwards compatibility, usually the news
-# system handles this on its own).
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
- . /etc/defaults/periodic.conf
- source_periodic_confs
-fi
-
-case "$daily_news_expire_enable" in
- [Yy][Ee][Ss])
- if [ ! -f /etc/news.expire ]
- then
- echo '$daily_news_expire_enable is set but /etc/news.expire' \
- "doesn't exist"
- rc=2
- else
- echo ""
- echo "Running news.expire:"
-
- /etc/news.expire && rc=0 || rc=3
- fi;;
-
- *) rc=0;;
-esac
-
-exit $rc
diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile
--- a/usr.sbin/periodic/etc/daily/Makefile
+++ b/usr.sbin/periodic/etc/daily/Makefile
@@ -14,7 +14,6 @@
210.backup-aliases \
221.backup-gpart \
222.backup-gmirror \
- 330.news \
400.status-disks \
401.status-graid \
406.status-gmirror \
diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf
--- a/usr.sbin/periodic/periodic.conf
+++ b/usr.sbin/periodic/periodic.conf
@@ -109,9 +109,6 @@
daily_accounting_flags=-q # Flags to /usr/sbin/sa
daily_accounting_save=3 # How many files to save
-# 330.news
-daily_news_expire_enable="YES" # Run news.expire
-
# 400.status-disks
daily_status_disks_enable="YES" # Check disk status
daily_status_disks_df_flags="-l -h" # df(1) flags for check

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 5:38 AM (18 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16606738
Default Alt Text
D30631.diff (2 KB)

Event Timeline