[Pkg-cron-devel] [SCM] Git repository for pkg-cron branch, master, updated. debian/3.0pl1-119-46-gb916153
Javier Fernandez-Sanguino
jfs at debian.org
Sat Jun 23 07:00:13 UTC 2012
The following commit has been merged in the master branch:
commit 668211613ff934c87d12dfdf93e1176e736f8204
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date: Sat Jun 23 08:36:57 2012 +0200
Remove the lost+found check as this is no longer required and causes issues
with some filesystems (e.g. bind mounts, locally mounted USB drives).
Additionally, in some filesystems the directory will be generated when
required. (Closes: #620164, #658743, #662605, #660879, #579640)
diff --git a/debian/changelog b/debian/changelog
index 139c800..c213b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-cron (3.0pl1-122) UNRELEASED; urgency=low
+cron (3.0pl1-123) UNRELEASED; urgency=low
* debian/standard.daily: Apply patch from Steve Allison to prevent checking
two times the same filesystem. This prevents bogus warnings about missing
lost+found in schroot bind mounts (Closes: #660879)
- * debian/rules: Apply patch from Steve Langasek to add cross compiler support to
- cron (Closes: #666892)
-
- -- Javier Fernández-Sanguino Peña <jfs at debian.org> Mon, 09 Apr 2012 17:23:01 +0200
+ * debian/rules: Apply patch from Steve Langasek to add cross compiler
+ support to cron (Closes: #666892)
+ * debian/cron.default, debian/standard.daily, debian/rules: Remove
+ the lost+found check as this is no longer required and causes
+ issues with some filesystems (e.g. bind mounts, locally mounted USB
+ drives). Additionally, in some filesystems the directory
+ will be generated when required. Removing the script makes it possible to
+ remove the dependency from a low priority package (Closes: #620164,
+ #658743, #662605, #660879, #579640)
+
+ -- Javier Fernández-Sanguino Peña <jfs at debian.org> Sat, 23 Jun 2012 08:28:27 +0200
cron (3.0pl1-121) unstable; urgency=low
diff --git a/debian/cron.default b/debian/cron.default
index c69934f..f62b7be 100644
--- a/debian/cron.default
+++ b/debian/cron.default
@@ -26,5 +26,3 @@ READ_ENV="yes"
#
#EXTRA_OPTS=""
-# Uncomment to disable lost+found check
-#CHECK_LOSTFOUND=no
diff --git a/debian/rules b/debian/rules
index 437bb5d..c140b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,6 @@ override_dh_auto_install:
override_dh_install:
dh_install
- install -m 755 debian/standard.daily debian/cron/etc/cron.daily/standard
install -m 644 debian/crontab.main debian/cron/etc/crontab
install -m 644 debian/placeholder debian/cron/etc/cron.d/.placeholder
install -m 644 debian/placeholder debian/cron/etc/cron.hourly/.placeholder
diff --git a/debian/standard.daily b/debian/standard.daily
deleted file mode 100644
index 2af128c..0000000
--- a/debian/standard.daily
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-# /etc/cron.daily/standard: standard daily maintenance script
-# Written by Ian A. Murdock <imurdock at gnu.ai.mit.edu>
-# Modified by Ian Jackson <ijackson at nyx.cs.du.edu>
-# Modified by Steve Greenland <stevegr at debian.org>
-# Modified by Christian Kastner <debian at kvr.at>, based on a script submitted
-# to the BTS by Justin B. Rye <jbr at edlug.org.uk>
-
-# Start in the root filesystem, make SElinux happy
-cd /
-LOCKFILE=/var/lock/cron.daily
-LOFO=lost+found
-SEENFS=""
-
-# When flock is available, avoid running more than once at a time
-if `which flock >/dev/null`; then
- exec 9> $LOCKFILE
- if ! flock -x -n 9; then
- cat <<EOF
-
-Unable to run /etc/cron.daily/standard because lockfile $LOCKFILE
-acquisition failed. This probably means that the previous day's
-instance is still running. Please check and correct if necessary.
-
-EOF
- exit 1
- fi
-fi
-
-# Don't continue if user wants to skip lost+found check
-if [ -f /etc/default/cron ]; then
- . /etc/default/cron
- [ "$CHECK_LOSTFOUND" = "no" ] && exit 0
-fi
-
-
-# Go through /etc/mtab, looking for filesystems with lost+found dirs
-while read DEV MTPT FSTYPE OPTS REST
-do
- # Skip devices outside of /dev
- echo "$DEV" | grep -q '^/dev/' || continue
-
- # Only check on FS where we might expect lost+found
- echo "$FSTYPE" | grep -q -E '^(ext2|ext3|ext4|xfs)$' || continue
-
- # Only check a filesystem once
- echo "$SEENFS" | grep -q "$DEV " && continue
- SEENFS="$DEV $SEENFS"
-
- [ "$MTPT" = '/' ] && MTPT=""
- # Replace spaces in the path (\040)
- MTPT="`echo $MTPT | sed -e 's/\\040/ /g'`"
-
- if [ ! -d "$MTPT/$LOFO" ]
- then
- # XFS does not necessarily have a lost+found dir
- [ "$FSTYPE" = "xfs" ] && continue
-
- # If we do not find the directory then it might
- # be an issue with the mtab or with how we parse
- # the information
- [ ! -d "$MTPT" ] && continue
-
- MISSING="$MISSING\n$MTPT/$LOFO"
- elif cd "$MTPT/$LOFO" 2> /dev/null
- then
- LIST=
- for NAME in *
- do
- [ "$NAME" = '*' ] && break
- LIST="$LIST\n\t$NAME"
- done
- [ -n "$LIST" ] || continue
- CONTENTS="$CONTENTS\n$MTPT/$LOFO:$LIST"
- else
- echo "Can't access $MTPT/$LOFO"
- fi
-done < /etc/mtab
-
-# Report findings if any
-if [ -n "$MISSING" ]
-then
- cat <<EOF
-
-Some local file systems lack a $LOFO directory. This means if the
-file system is damaged and needs to be repaired, fsck will not have
-anywhere to put stray files for recovery. You should consider creating
-a $LOFO directory with mklost+found(8).
-
-The following $LOFO directories were not available:
-EOF
- echo $MISSING
-fi
-
-if [ -n "$CONTENTS" ]
-then
- cat <<EOF
-
-Items were found in $LOFO directories. This is probably the result
-of a crash or bad shutdown, or possibly of a disk problem. You should
-examine them to see if they contain important information, and either
-retrieve them from $LOFO or delete them.
-
-The following items were found:
-EOF
- echo $CONTENTS
-fi
-
-# Remove lock file (releasing lock)
-rm -f $LOCKFILE
--
Git repository for pkg-cron
More information about the Pkg-cron-devel
mailing list