Skip to content
Snippets Groups Projects
Forked from pkg / systemd
132 commits behind the upstream repository.
  • Michael Biebl's avatar
    677d5ce9
    Import Debian changes 241-7~deb10u2 · 677d5ce9
    Michael Biebl authored
    systemd (241-7~deb10u2) buster; urgency=medium
    
      * core: never propagate reload failure to service result.
        Fixes a regression introduced in v239 where the main process of a
        service unit gets killed on reload if ExecReload fails. (Closes: #936032)
      * shared/seccomp: add sync_file_range2.
        Some architectures need the arguments to be reordered because of alignment
        issues. Otherwise, it's the same as sync_file_range.
        Fixes sync_file_range failures in nspawn containers on arm, ppc.
        (Closes: #935091)
      * core: factor root_directory application out of apply_working_directory.
        Fixes RootDirectory not working when used in combination with User.
        (Closes: #939408)
      * shared/bus-util: drop trusted annotation from
        bus_open_system_watch_bind_with_description().
        This ensures that access controls on systemd-resolved's D-Bus interface
        are enforced properly.
        (CVE-2019-15718, Closes: #939353)
      * login: add a missing error check for session_set_leader()
        Fixes assertion due to insufficient function return check.
        (Closes: #939998)
      * d/e/r/73-usb-net-by-mac.rules: import net.ifnames only for network devices
        (Closes: #934589)
      * d/e/r/73-usb-net-by-mac.rules: skip if iface name was provided by user-space
      * namespace: make MountFlags=shared work again (Closes: #939551)
      * mount/generators: do not make unit wanted by its device unit.
        Among other things, this fixes StopWhenUnneeded=true being broken for
        mount units. (Closes: #941758)
    677d5ce9
    History
    Import Debian changes 241-7~deb10u2
    Michael Biebl authored
    systemd (241-7~deb10u2) buster; urgency=medium
    
      * core: never propagate reload failure to service result.
        Fixes a regression introduced in v239 where the main process of a
        service unit gets killed on reload if ExecReload fails. (Closes: #936032)
      * shared/seccomp: add sync_file_range2.
        Some architectures need the arguments to be reordered because of alignment
        issues. Otherwise, it's the same as sync_file_range.
        Fixes sync_file_range failures in nspawn containers on arm, ppc.
        (Closes: #935091)
      * core: factor root_directory application out of apply_working_directory.
        Fixes RootDirectory not working when used in combination with User.
        (Closes: #939408)
      * shared/bus-util: drop trusted annotation from
        bus_open_system_watch_bind_with_description().
        This ensures that access controls on systemd-resolved's D-Bus interface
        are enforced properly.
        (CVE-2019-15718, Closes: #939353)
      * login: add a missing error check for session_set_leader()
        Fixes assertion due to insufficient function return check.
        (Closes: #939998)
      * d/e/r/73-usb-net-by-mac.rules: import net.ifnames only for network devices
        (Closes: #934589)
      * d/e/r/73-usb-net-by-mac.rules: skip if iface name was provided by user-space
      * namespace: make MountFlags=shared work again (Closes: #939551)
      * mount/generators: do not make unit wanted by its device unit.
        Among other things, this fixes StopWhenUnneeded=true being broken for
        mount units. (Closes: #941758)
mount-remove-unused-mount_is_auto-and-mount_is_automount.patch 1006 B
From: Tom Yan <tom.ty89@gmail.com>
Date: Thu, 10 Jan 2019 00:19:43 +0800
Subject: mount: remove unused mount_is_auto and mount_is_automount

(cherry picked from commit d0fe45cb151774827a3aca4ea5a19856dec9f600)
---
 src/core/mount.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/core/mount.c b/src/core/mount.c
index 7064fa1..8da818b 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -101,20 +101,6 @@ static bool mount_is_bind(const MountParameters *p) {
         return false;
 }
 
-static bool mount_is_auto(const MountParameters *p) {
-        assert(p);
-
-        return !fstab_test_option(p->options, "noauto\0");
-}
-
-static bool mount_is_automount(const MountParameters *p) {
-        assert(p);
-
-        return fstab_test_option(p->options,
-                                 "comment=systemd.automount\0"
-                                 "x-systemd.automount\0");
-}
-
 static bool mount_is_bound_to_device(const Mount *m) {
         const MountParameters *p;