[systemd-commits] 3 commits - Makefile.am src/mount-setup.c

[Lennart Poettering]

 Makefile.am       |    5 +++--
 src/mount-setup.c |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 46891d97b25d171603c66a512310a53e3cc78af6
Author: Thierry Reding <thierry.reding at avionic-design.de>
Date:   Wed Nov 24 19:49:21 2010 +0100

    build-sys: distribute introspect.awk

diff --git a/Makefile.am b/Makefile.am
index a615c3f..eb63c5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -317,7 +317,8 @@ EXTRA_DIST = \
 	units/fsck at .service.in \
 	units/fsck-root.service.in \
 	units/quotacheck.service.in \
-	systemd.pc.in
+	systemd.pc.in \
+	introspect.awk
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \

commit 382a0310f67ca87c40155847a036937e2f4177fa
Author: Thierry Reding <thierry.reding at avionic-design.de>
Date:   Wed Nov 24 19:49:15 2010 +0100

    build-sys: fix out-of-tree build
    
    The introspect AWK script is located in the source tree, which is not
    necessarily the same as the build tree, so prepend $(srcdir).

diff --git a/Makefile.am b/Makefile.am
index 694ec57..a615c3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1122,7 +1122,7 @@ DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 org.freedesktop.systemd1.%.xml: systemd
 	$(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
-		$(STRINGS) $@.tmp | $(AWK) -f introspect.awk | \
+		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
 		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 CLEANFILES += \

commit 46ff0ed7b09d7c76254285b69cfe9d5f86950b8f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Nov 24 22:27:45 2010 +0100

    mount: trivial typo fix

diff --git a/src/mount-setup.c b/src/mount-setup.c
index 7e468e2..4adb86f 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -55,7 +55,7 @@ static const MountPoint mount_table[] = {
 };
 
 /* These are API file systems that might be mounted by other software,
- * we just list them here so that we know that we should igore them */
+ * we just list them here so that we know that we should ignore them */
 
 static const char * const ignore_paths[] = {
         "/selinux",
@@ -78,7 +78,7 @@ bool mount_point_is_api(const char *path) {
 }
 
 bool mount_point_ignore(const char *path) {
-       unsigned i;
+        unsigned i;
 
         for (i = 0; i < ELEMENTSOF(ignore_paths); i++)
                 if (path_equal(path, ignore_paths[i]))