← Back to branch summary

~ubuntu-branches/debian/wheezy/autofs/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/052_292762_dont_lsmod_on_monolithic_kernels

  • Committer: Bazaar Package Importer
  • Author(s): Steinar H. Gunderson
  • Date: 2006-11-10 15:54:00 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20061110155400-xwc4587cx70opq9e
Tags: 4.1.4-13
http://bugs.debian.org/396191
* Remove 077_fix_nfs_submounts_with_2_6_18 in favor of
  077_dont_create_remote_dirs, which is upstream's version of the fix and
  solves the problem properly. (Closes: #396191)
* 078_locking_fix_1: Patch from upstream we should have included ages ago,
  fixes some locking issues.
* 079_no_unlink_upstream: Patch from upstream, adds a few safeguards to make
  sure automount doesn't accidentially unlink a file when it wants to remove
  a directory. (This should normally never happen, but extra safeguards are
  always a good idea.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/052_292762_dont_lsmod_on_monolithic_kernels
1
 
--- autofs-4.1.4_beta2/samples/rc.autofs.in.orig        2005-02-15 02:31:20.000000000 +0100
2
 
+++ autofs-4.1.4_beta2/samples/rc.autofs.in     2005-02-15 02:31:37.000000000 +0100
3
 
@@ -604,7 +604,7 @@
4
 
                # autofs filesystem support not loaded
5
 
                echo -n ' loading autofs4 kernel module,'
6
 
                modprobe autofs4 || true
7
 
-       elif lsmod | grep -q autofs[^4]; then
8
 
+       elif ( [ -f /proc/modules ] && lsmod ) | grep -q autofs[^4]; then
9
 
                # wrong autofs filesystem module loaded
10
 
                echo
11
 
                echo "WARNING: autofs kernel module is loaded, autofs4 needed"