diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-04-06 14:56:03 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-04-26 12:59:13 +0200 |
| commit | da4b83e77bc603745cf4a365d7f013301ef7fa89 (patch) | |
| tree | 293d9508eeb1f841c71b0b0517287fd398aded82 /src/core/mount-setup.c | |
| parent | eaca07ccfdf5d7dabc50afc7e539c2413dd69d3e (diff) | |
Prep v228: Add remaining updates from upstream (3/3)
Apply remaining fixes and the performed move of utility functions
into their own foo-util.[hc] files on the rest of elogind.
Diffstat (limited to 'src/core/mount-setup.c')
| -rw-r--r-- | src/core/mount-setup.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index 9dfa77823..f30adabbf 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.c @@ -19,28 +19,32 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <sys/mount.h> #include <errno.h> +#include <ftw.h> #include <stdlib.h> +#include <sys/mount.h> #include <unistd.h> -#include <ftw.h> -#include "mount-setup.h" -//#include "dev-setup.h" +#include "alloc-util.h" //#include "bus-util.h" +#include "cgroup-util.h" +//#include "dev-setup.h" +//#include "efivars.h" +#include "label.h" //#include "log.h" #include "macro.h" -//#include "util.h" -#include "label.h" -//#include "set.h" -//#include "strv.h" +//#include "missing.h" #include "mkdir.h" +#include "mount-setup.h" +#include "mount-util.h" #include "path-util.h" -//#include "missing.h" -#include "virt.h" -//#include "efivars.h" +//#include "set.h" //#include "smack-util.h" -#include "cgroup-util.h" +//#include "strv.h" +#include "string-util.h" +#include "user-util.h" +//#include "util.h" +#include "virt.h" typedef enum MountMode { MNT_NONE = 0, |