Complete removal of 320.rdist by removing its entry from periodic.conf and

removing the related 220.backup-distfile script and associatd periodic.conf
entry.

Discussed with:	obrien

2 files changed, 0 insertions, 45 deletions

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index a4eb32578839..bcb1c7f29ae3 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -69,9 +69,6 @@ daily_backup_passwd_enable="YES"			# Backup passwd & group
 # 210.backup-aliases
 daily_backup_aliases_enable="YES"			# Backup mail aliases
 
-# 220.backup-distfile
-daily_backup_distfile_enable="YES"			# Backup /etc/Distfile
-
 # 300.calendar
 daily_calendar_enable="NO"				# Run calendar -a
 
@@ -81,9 +78,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
 
-# 320.distfile
-daily_distfile_enable="YES"				# Run rdist daily
-
 # 330.news
 daily_news_expire_enable="YES"				# Run news.expire
 
diff --git a/etc/periodic/daily/220.backup-distfile b/etc/periodic/daily/220.backup-distfile
deleted file mode 100755
index 93d766031456..000000000000
--- a/etc/periodic/daily/220.backup-distfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# 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_backup_distfile_enable" in
-    [Yy][Ee][Ss])
-	if [ ! -f /etc/Distfile ]
-	then
-	    echo '$daily_backup_distfile_enable is set but /etc/Distfile' \
-		"doesn't exist"
-	    rc=2
-	else
-	    bak=/var/backups
-	    rc=0
-
-	    echo ""
-	    echo "Backing up /etc/Distfile:"
-
-	    if ! cmp -s $bak/Distfile.bak /etc/Distfile
-	    then
-		rc=1
-		mv $bak/Distfile.bak $bak/Distfile.bak2
-		cp /etc/Distfile $bak/Distfile.bak || rc=3
-	    fi
-	fi;;
-
-    *)  rc=0;;
-esac
-
-exit $rc