← Back to branch summary

~ubuntu-branches/debian/jessie/systemd/jessie

« back to all changes in this revision

Viewing changes to src/mount.h

  • Committer: Package Import Robot
  • Author(s): Tollef Fog Heen, Tollef Fog Heen, Michael Biebl
  • Date: 2012-04-03 19:59:17 UTC
  • mfrom: (1.1.10) (6.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120403195917-l532urrbg4pkreas
Tags: 44-1
http://bugs.debian.org/664364
http://bugs.debian.org/663219
http://bugs.debian.org/663323
[ Tollef Fog Heen ]
* New upstream version.
  - Backport 3492207: journal: PAGE_SIZE is not known on ppc and other
    archs
  - Backport 5a2a2a1: journal: react with immediate rotation to a couple
    of more errors
  - Backport 693ce21: util: never follow symlinks in rm_rf_children()
    Fixes CVE-2012-1174, closes: #664364
* Drop output message from init-functions hook, it's pointless.
* Only rmdir /lib/init/rw if it exists.
* Explicitly order debian-fixup before sysinit.target to prevent a
  possible race condition with the creation of sockets.  Thanks to
  Michael Biebl for debugging this.
* Always restart the initctl socket on upgrades, to mask sysvinit
  removing it.

[ Michael Biebl ]
* Remove workaround for non-interactive sessions from pam config again.
* Create compat /dev/initctl symlink in case we are upgrading from a system
  running a newer version of sysvinit (using /run/initctl) and sysvinit is
  replaced with systemd-sysv during the upgrade. Closes: #663219
* Install new man pages.
* Build-Depend on valac (>= 0.12) instead of valac-0.12. Closes: #663323

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mount.h
59
59
        int passno;
60
60
} MountParameters;
61
61
 
 
62
typedef enum MountResult {
 
63
        MOUNT_SUCCESS,
 
64
        MOUNT_FAILURE_RESOURCES,
 
65
        MOUNT_FAILURE_TIMEOUT,
 
66
        MOUNT_FAILURE_EXIT_CODE,
 
67
        MOUNT_FAILURE_SIGNAL,
 
68
        MOUNT_FAILURE_CORE_DUMP,
 
69
        _MOUNT_RESULT_MAX,
 
70
        _MOUNT_RESULT_INVALID = -1
 
71
} MountResult;
 
72
 
62
73
struct Mount {
63
 
        Meta meta;
 
74
        Unit meta;
64
75
 
65
76
        char *where;
66
77
 
78
89
        bool just_mounted:1;
79
90
        bool just_changed:1;
80
91
 
81
 
        bool failure:1;
82
 
        bool reload_failure:1;
 
92
        MountResult result;
 
93
        MountResult reload_result;
83
94
 
84
95
        mode_t directory_mode;
85
96
 
107
118
const char* mount_exec_command_to_string(MountExecCommand i);
108
119
MountExecCommand mount_exec_command_from_string(const char *s);
109
120
 
 
121
const char* mount_result_to_string(MountResult i);
 
122
MountResult mount_result_from_string(const char *s);
 
123
 
110
124
#endif