autofs-5.0.4-fix-restorecon.patch

   1 autofs-5.0.4 - fix restorecon
   2
   3 From: Ian Kent <raven@themaw.net>
   4
   5 If the misc device node doesn't exist don't try to run restorecon on it.
   6 ---
   7
   8  CHANGELOG             |    1 +
   9  redhat/autofs.init.in |    2 +-
  10  samples/rc.autofs.in  |    2 +-
  11  3 files changed, 3 insertions(+), 2 deletions(-)
  12
  13
  14 diff --git a/CHANGELOG b/CHANGELOG
  15 index 96a4617..00b455e 100644
  16 --- a/CHANGELOG
  17 +++ b/CHANGELOG
  18 @@ -33,6 +33,7 @@
  19  - add LSB init script parameter block.
  20  - fix file map lookup when reading included or nsswitch sources.
  21  - use misc device ioctl interface by default, if available.
  22 +- fix call restorecon when misc device file doesn't exist.
  23
  24  4/11/2008 autofs-5.0.4
  25  -----------------------
  26 diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
  27 index 0fd1777..a9a33c8 100644
  28 --- a/redhat/autofs.init.in
  29 +++ b/redhat/autofs.init.in
  30 @@ -76,7 +76,7 @@ function start() {
  31                                 mknod -m 0600 /dev/$DEVICE c 10 $MINOR
  32                         fi
  33                 fi
  34 -               if [ -x /sbin/restorecon ]; then
  35 +               if [ -x /sbin/restorecon -a -c /dev/$DEVICE ]; then
  36                         /sbin/restorecon /dev/$DEVICE
  37                 fi
  38         else
  39 diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
  40 index 63a0c5d..78cbec2 100644
  41 --- a/samples/rc.autofs.in
  42 +++ b/samples/rc.autofs.in
  43 @@ -66,7 +66,7 @@ function start() {
  44                                 mknod -m 0600 /dev/$DEVICE c 10 $MINOR
  45                         fi
  46                 fi
  47 -               if [ -x /sbin/restorecon ]; then
  48 +               if [ -x /sbin/restorecon -a -c /dev/$DEVICE ]; then
  49                         /sbin/restorecon /dev/$DEVICE
  50                 fi
  51         else