[systemd-commits] 3 commits - configure.ac README src/delta src/udev units/user at .service.m4.in

[Zbigniew Jędrzejewski-Szmek]

 README                        |    2 +-
 configure.ac                  |    2 +-
 src/delta/delta.c             |    2 +-
 src/udev/udev-builtin-blkid.c |   13 ++++++++++++-
 units/user at .service.m4.in     |    4 ----
 5 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit d47f6ca5f9b7a0b400d8bdb050151a0284fb4bdb
Author: Gabriel de Perthuis <g2p.code at gmail.com>
Date:   Sat Dec 13 01:56:56 2014 +0100

    blkid: Warn when rejecting a superblock with a bad csum
    
    Bump libblkid requirement from 2.20 to 2.24.
    util-linux 2.25 is actually required since fdbbad981cc5da8bb4ed7e9b6646e7a114745ec5

diff --git a/README b/README
index 9c80a56..73a09e4 100644
--- a/README
+++ b/README
@@ -111,7 +111,7 @@ REQUIREMENTS:
         libcap
         libmount >= 2.20 (from util-linux)
         libseccomp >= 1.0.0 (optional)
-        libblkid >= 2.20 (from util-linux) (optional)
+        libblkid >= 2.24 (from util-linux) (optional)
         libkmod >= 15 (optional)
         PAM >= 1.1.2 (optional)
         libcryptsetup (optional)
diff --git a/configure.ac b/configure.ac
index e14f3cf..90aa3cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -432,7 +432,7 @@ AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"])
 have_blkid=no
 AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [disable blkid support]))
 if test "x$enable_blkid" != "xno"; then
-        PKG_CHECK_MODULES(BLKID, [ blkid >= 2.20 ],
+        PKG_CHECK_MODULES(BLKID, [ blkid >= 2.24 ],
                 [AC_DEFINE(HAVE_BLKID, 1, [Define if blkid is available]) have_blkid=yes], have_blkid=no)
         if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then
                 AC_MSG_ERROR([*** blkid support requested but libraries not found])
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 810f27d..83bd8c4 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -221,6 +221,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
         blkid_probe pr;
         const char *data;
         const char *name;
+        const char *prtype = NULL;
         int nvals;
         int i;
         int err = 0;
@@ -256,7 +257,8 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
         blkid_probe_set_superblocks_flags(pr,
                 BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID |
                 BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE |
-                BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION);
+                BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION |
+                BLKID_SUBLKS_BADCSUM);
 
         if (noraid)
                 blkid_probe_filter_superblocks_usage(pr, BLKID_FLTR_NOTIN, BLKID_USAGE_RAID);
@@ -278,6 +280,15 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
         err = probe_superblocks(pr);
         if (err < 0)
                 goto out;
+        if (blkid_probe_has_value(pr, "SBBADCSUM")) {
+                if (!blkid_probe_lookup_value(pr, "TYPE", &prtype, NULL))
+                        log_warning("incorrect %s checksum on %s",
+                                    prtype, udev_device_get_devnode(dev));
+                else
+                        log_warning("incorrect checksum on %s",
+                                    udev_device_get_devnode(dev));
+                goto out;
+        }
 
         /* If we are a partition then our parent passed on the root
          * partition UUID to us */

commit 9b6e0ce5acff34a87314f3eb9f72532486840edf
Author: Ivan Shapovalov <intelfx100 at gmail.com>
Date:   Sun Dec 14 16:04:01 2014 +0300

    delta: fix output alignment of [REDIRECTED] entries

diff --git a/src/delta/delta.c b/src/delta/delta.c
index a3a121f..de963f7 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -123,7 +123,7 @@ static int notify_override_redirected(const char *top, const char *bottom) {
         if (!(arg_flags & SHOW_REDIRECTED))
                 return 0;
 
-        printf("%s%s%s   %s %s %s\n",
+        printf("%s%s%s %s %s %s\n",
                ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
                top, draw_special_char(DRAW_ARROW), bottom);
         return 1;

commit cf5a8997515dc5fc96f34385ad153e4b213b4705
Author: Mantas Mikulėnas <grawity at gmail.com>
Date:   Sun Dec 14 19:12:34 2014 +0200

    build-sys: remove commented-out m4 from user at .service
    
    Otherwise this actually remains in the generated unit in /usr/lib.
    
    If you want to keep it commented out, a m4-compatible way would be:
    
        m4_ifdef(`HAVE_SMACK',
        dnl Capabilities=cap_mac_admin=i
        dnl SecureBits=keep-caps
        )

diff --git a/units/user at .service.m4.in b/units/user at .service.m4.in
index 0daa43a..1e21d51 100644
--- a/units/user at .service.m4.in
+++ b/units/user at .service.m4.in
@@ -17,7 +17,3 @@ ExecStart=- at rootlibexecdir@/systemd --user
 Slice=user-%i.slice
 KillMode=mixed
 Delegate=yes
-#m4_ifdef(`HAVE_SMACK',
-#Capabilities=cap_mac_admin=i
-#SecureBits=keep-caps
-#)