From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 11 Dec 2010 17:12:30 +0000 (+0000)
Subject: helper: Ignore times of special files when calculating checksum.
X-Git-Tag: 3.3~1
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=3efcdd7df2b8997e0d4f543703d371e8b7079d5f;p=febootstrap.git

helper: Ignore times of special files when calculating checksum.

Variation in the times of /dev/ptmx was causing the
appliance to be rebuilt too frequently.
---

diff --git a/helper/checksum.c b/helper/checksum.c
index 337134c..2df42bc 100644
--- a/helper/checksum.c
+++ b/helper/checksum.c
@@ -65,11 +65,12 @@ checksum_end (void)
 static void
 checksum_file_stat (const char *filename, const struct stat *statbuf)
 {
-  /* Publically writable directories (ie. /tmp) don't have stable
-   * times.  Since we only care about some attributes of directories
-   * in any case, we vary the output accordingly.
+  /* Publically writable directories (ie. /tmp) and special files
+   * don't have stable times.  Since we only care about some
+   * attributes of directories and special files, we vary the output
+   * accordingly.
    */
-  if (!S_ISDIR (statbuf->st_mode))
+  if (S_ISREG (statbuf->st_mode))
     fprintf (pp, "%s %ld %ld %d %d %ld %o\n",
              filename,
              (long) statbuf->st_ctime, (long) statbuf->st_mtime,