~ubuntu-branches/ubuntu/quantal/autofs5/quantal

« back to all changes in this revision

Viewing changes to debian/patches/autofs-5.0.5-make-verbose-mode-a-little-less-verbose.patch

• browse files at revision 21
• compare with another revision
• download diff
• download tarball
• view history from revision 21

Show diffs side-by-side

added

removed

debian/patches/autofs-5.0.5-make-verbose-mode-a-little-less-verbose.patch

 

1

autofs-5.0.5 - Make "verbose" mode a little less verbose

 

2

 

 

3

From: Leonardo Chiquitto <leonardo.lists@gmail.com>

 

4

 

 

5

Remove some log message duplication for verbose logging.

 

6

---

 

7

 

 

8

 daemon/automount.c      |    2 +-

 

9

 daemon/lookup.c         |    2 +-

 

10

 modules/mount_changer.c |    2 +-

 

11

 modules/mount_ext2.c    |    2 +-

 

12

 modules/mount_generic.c |    2 +-

 

13

 modules/mount_nfs.c     |    2 +-

 

14

 6 files changed, 6 insertions(+), 6 deletions(-)

 

15

 

 

16

 

 

17

diff --git a/daemon/automount.c b/daemon/automount.c

 

18

index 206734b..9939a25 100644

 

19

--- a/daemon/automount.c

 

20

+++ b/daemon/automount.c

 

21

@@ -512,7 +512,7 @@ static int umount_subtree_mounts(struct autofs_point *ap, const char *path, unsi

 

22

         * it already to ensure it's ok to remove any offset triggers.

 

23

         */

 

24

        if (!is_mm_root && is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) {

 

25

-               info(ap->logopt, "unmounting dir = %s", path);

 

26

+               debug(ap->logopt, "unmounting dir = %s", path);

 

27

                if (umount_ent(ap, path)) {

 

28

                        warn(ap->logopt, "could not umount dir %s", path);

 

29

                        left++;

 

30

diff --git a/daemon/lookup.c b/daemon/lookup.c

 

31

index f5d9da8..a4bd07f 100644

 

32

--- a/daemon/lookup.c

 

33

+++ b/daemon/lookup.c

 

34

@@ -688,7 +688,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_

 

35

        char *type, *format;

 

36

 

 

37

        if (stat(map->argv[0], &st) == -1) {

 

38

-               warn(ap->logopt, "file map not found");

 

39

+               debug(ap->logopt, "file map not found");

 

40

                return NSS_STATUS_NOTFOUND;

 

41

        }

 

42

 

 

43

diff --git a/modules/mount_changer.c b/modules/mount_changer.c

 

44

index f4d82dd..d7bfa09 100644

 

45

--- a/modules/mount_changer.c

 

46

+++ b/modules/mount_changer.c

 

47

@@ -129,7 +129,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int

 

48

 

 

49

                return 1;

 

50

        } else {

 

51

-               info(ap->logopt, MODPREFIX "mounted %s type %s on %s",

 

52

+               debug(ap->logopt, MODPREFIX "mounted %s type %s on %s",

 

53

                    what, fstype, fullpath);

 

54

                return 0;

 

55

        }

 

56

diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c

 

57

index 26d59d1..1edf347 100644

 

58

--- a/modules/mount_ext2.c

 

59

+++ b/modules/mount_ext2.c

 

60

@@ -140,7 +140,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int

 

61

 

 

62

                return 1;

 

63

        } else {

 

64

-               info(ap->logopt,

 

65

+               debug(ap->logopt,

 

66

                      MODPREFIX "mounted %s type %s on %s",

 

67

                      what, fstype, fullpath);

 

68

                return 0;

 

69

diff --git a/modules/mount_generic.c b/modules/mount_generic.c

 

70

index da85d1a..79e3d32 100644

 

71

--- a/modules/mount_generic.c

 

72

+++ b/modules/mount_generic.c

 

73

@@ -122,7 +122,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int

 

74

 

 

75

                return 1;

 

76

        } else {

 

77

-               info(ap->logopt, MODPREFIX "mounted %s type %s on %s",

 

78

+               debug(ap->logopt, MODPREFIX "mounted %s type %s on %s",

 

79

                     loc, fstype, fullpath);

 

80

                free(loc);

 

81

                return 0;

 

82

diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c

 

83

index 21e1929..9110eba 100644

 

84

--- a/modules/mount_nfs.c

 

85

+++ b/modules/mount_nfs.c

 

86

@@ -251,7 +251,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int

 

87

                }

 

88

 

 

89

                if (!err) {

 

90

-                       info(ap->logopt, MODPREFIX "mounted %s on %s", loc, fullpath);

 

91

+                       debug(ap->logopt, MODPREFIX "mounted %s on %s", loc, fullpath);

 

92

                        free(loc);

 

93

                        free_host_list(&hosts);

 

94

                        return 0;

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1