Attachment 225351 Details for Bug 256238 – git commit to remove news.expire from periodic

[patch] git commit to remove news.expire from periodic

periodic-rm-news.diff (text/plain), 2.40 KB, created by Nils Johannsen on 2021-05-29 10:00:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nils Johannsen

Created: 2021-05-29 10:00:45 UTC

Size: 2.40 KB

patch

obsolete

>commit 5eea02490b53f7b36056bc883afbe717b5f37eab
>Author: Nils Johannsen <n.johannsen@beckhoff.com>
>Date:   Sat May 29 11:39:48 2021 +0200
>
>    periodic: remove obsolete news.expire
>    
>    Together with the initial import of 386BSD 0.1 in 1993 the daily
>    execution of /etc/news.expire was invented (see commit 1bf9d5d9518e).
>    This excution was maintained throughout and transferred accordingly to
>    periodic in 1997, resulting in daily/330.news (see e.g. commit 28dce04d1975)
>    But as far as I see there was nevery any /etc/news.expire existing.
>
>diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
>index 46174da2772..1f82bdbc7e8 100644
>--- a/share/man/man5/periodic.conf.5
>+++ b/share/man/man5/periodic.conf.5
>@@ -396,12 +396,6 @@ is set to
> .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
>index ec064376d78..00000000000
>--- 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/periodic.conf b/usr.sbin/periodic/periodic.conf
>index d2d59fb783b..0e0cfb89533 100644
>--- a/usr.sbin/periodic/periodic.conf
>+++ b/usr.sbin/periodic/periodic.conf
>@@ -104,9 +104,6 @@ daily_accounting_compress="NO"				# Gzip rotated files
> 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

Actions: View | Diff

Attachments on bug 256238: 225351