diff options
| -rw-r--r-- | NEWS | 87 | ||||
| -rw-r--r-- | man/systemd.mount.xml | 12 | ||||
| -rw-r--r-- | src/core/dbus-mount.c | 1 | ||||
| -rw-r--r-- | src/core/load-fragment-gperf.gperf.m4 | 1 | ||||
| -rw-r--r-- | src/core/mount.c | 34 | ||||
| -rw-r--r-- | src/core/mount.h | 1 | ||||
| -rw-r--r-- | units/tmp.mount.m4 | 3 |
7 files changed, 92 insertions, 47 deletions
@@ -1,5 +1,92 @@ systemd System and Service Manager +CHANGES WITH 228: + + * When creating transient services via the bus API it is now + possible to pass in a set of file descriptors to use as + STDIN/STDOUT/STDERR for the invoked process. + + * A number of properties previously only settable in unit + files are now also available as properties to set when + creating transient units programmatically via the bus, as it + is exposed with systemd-run's --property= + setting. Specifically, these are: SyslogIdentifier=, + SyslogLevelPrefix=, TimerSlackNSec=, OOMScoreAdjust=, + EnvironmentFile=, ReadWriteDirectories=, + ReadOnlyDirectories=, InaccessibleDirectories=, + ProtectSystem=, ProtectHome=, RuntimeDirectory=. + + * Any reference to /etc/mtab has been dropped from + systemd. The file has been obsolete since a while, but + systemd refused to work on systems where it was incorrectly + set up (it should be a symlink or non-existant). Please make + sure to update to util-linux 2.27.1 or newer in conjunction + with this systemd release, which also drops any reference to + /etc/mtab. If you maintain a distribution make sure that no + software you package still references it, as this is a + likely source of bugs. There's also a glibc bug pending, + asking for removal of any reference to the file: + + https://sourceware.org/bugzilla/show_bug.cgi?id=19108 + + * The compression framing format used by the journal or + coredump processing has changed to be in line with what the + official LZ4 tools generate. LZ4 compression support in + systemd was considered unsupported previously, as the format + was not compatible with the normal tools. With this release + this has changed now, and it is hence safe for downstream + distributions to turn it on. While not compressing as well + as the XZ,LZ4 is substantially faster, which makes + it a good default choice for the compression logic in the + journal and in coredump handling. + + * Wherever systemd expects a calendar timestamp specification + (like in journalctl's --since= and --until= switches) UTC + timestamps are now supported. Timestamps suffixed with "UTC" + are now considered to be in Universal Time Coordinated + instead of the local timezone. Also, timestamps may now + optionally be specified with a sub-second accuracy. Both of + these additions also apply to recurring calendar event + specification, such as OnCalendar= in timer units. + + * systemd-tmpfiles learned two new line types "q" and "Q" that + operate like "v", but also set up a basic btrfs quota + hierarchy when used on a btrfs file system with quota + enabled. + + * systemd-detect-virt gained a new --chroot switch to detect + whether execution takes place in a chroot() environment. + + * CPUAffinity= now takes CPU index ranges in addition to just + individual indexes. + + * systemd will now bump the net.unix.max_dgram_qlen to 512 by + default now (kernel default is 16). This is beneficial for + avoiding blocking on AF_UNIX/SOCK_DGRAM sockets since it + allows substantially larger numbers of queued + datagrams. This should increase the capability of systemd to + parallelize boot-up, as logging and sd_notify() are unlikely + to stall execution anymore. If you need to change the value + from the new defaults, use the usual sysctl.d/ snippets. + + * The various memory-related resource limit settings (such as + LimitAS=) now understand the usual K, M, G, ... suffixes to + the base of 1024 (IEC). Similar, the time-related settings + understand the usual min, h, day, ... suffixes now. + + * journalctl gained a new "--sync" switch that asks the + journal daemon to write all so far unwritten log messages to + disk and sync the files, before returning. + + * Support for the ".snapshot" unit type has been removed. This + feature turned out to be little useful and little used, and + has now been removed from the core and from systemctl. + + * A new service execution setting PassEnvironment= has been + added that allows importing select environment variables + from PID1's environment block into the environment block of + the service. + CHANGES WITH 227: * systemd now depends on util-linux v2.27. More specifically, diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 67e96dc157..a724d88584 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -366,18 +366,6 @@ </varlistentry> <varlistentry> - <term><varname>SmackFileSystemRootLabel=</varname></term> - <listitem><para>Takes a string for the SMACK label. - This option specifies the label to assign the root of the - file system if it lacks the SMACK extended attribute. - Note that this option will be ignored if kernel does not - support the SMACK feature. - See <ulink - url="https://www.kernel.org/doc/Documentation/security/Smack.txt">Smack.txt</ulink> - for details. </para></listitem> - </varlistentry> - - <varlistentry> <term><varname>TimeoutSec=</varname></term> <listitem><para>Configures the time to wait for the mount command to finish. If a command does not exit within the diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c index 0c91850c52..90a6d37073 100644 --- a/src/core/dbus-mount.c +++ b/src/core/dbus-mount.c @@ -118,7 +118,6 @@ const sd_bus_vtable bus_mount_vtable[] = { SD_BUS_PROPERTY("ControlPID", "u", bus_property_get_pid, offsetof(Mount, control_pid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("DirectoryMode", "u", bus_property_get_mode, offsetof(Mount, directory_mode), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("SloppyOptions", "b", bus_property_get_bool, offsetof(Mount, sloppy_options), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("SmackFileSystemRootLabel", "s", NULL, offsetof(Mount, smack_fs_root_label), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Mount, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), BUS_EXEC_COMMAND_VTABLE("ExecMount", offsetof(Mount, exec_command[MOUNT_EXEC_MOUNT]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION), BUS_EXEC_COMMAND_VTABLE("ExecUnmount", offsetof(Mount, exec_command[MOUNT_EXEC_UNMOUNT]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION), diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 index 3294054ef7..c7ec027954 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -320,7 +320,6 @@ Mount.Type, config_parse_string, 0, Mount.TimeoutSec, config_parse_sec, 0, offsetof(Mount, timeout_usec) Mount.DirectoryMode, config_parse_mode, 0, offsetof(Mount, directory_mode) Mount.SloppyOptions, config_parse_bool, 0, offsetof(Mount, sloppy_options) -Mount.SmackFileSystemRootLabel, config_parse_string, 0, offsetof(Mount, smack_fs_root_label) EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl CGROUP_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl diff --git a/src/core/mount.c b/src/core/mount.c index e86bcf3830..9b44357e90 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -41,7 +41,6 @@ #include "parse-util.h" #include "path-util.h" #include "process-util.h" -#include "smack-util.h" #include "special.h" #include "string-table.h" #include "string-util.h" @@ -211,7 +210,6 @@ static void mount_done(Unit *u) { assert(m); m->where = mfree(m->where); - m->smack_fs_root_label = mfree(m->smack_fs_root_label); mount_parameters_done(&m->parameters_proc_self_mountinfo); mount_parameters_done(&m->parameters_fragment); @@ -682,8 +680,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { "%sOptions: %s\n" "%sFrom /proc/self/mountinfo: %s\n" "%sFrom fragment: %s\n" - "%sDirectoryMode: %04o\n" - "%sSmackFileSystemRootLabel: %s\n", + "%sDirectoryMode: %04o\n", prefix, mount_state_to_string(m->state), prefix, mount_result_to_string(m->result), prefix, m->where, @@ -692,8 +689,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { prefix, p ? strna(p->options) : "n/a", prefix, yes_no(m->from_proc_self_mountinfo), prefix, yes_no(m->from_fragment), - prefix, m->directory_mode, - prefix, strna(m->smack_fs_root_label)); + prefix, m->directory_mode); if (m->control_pid > 0) fprintf(f, @@ -870,29 +866,9 @@ fail: mount_enter_mounted(m, MOUNT_FAILURE_RESOURCES); } -static int mount_get_opts(Mount *m, char **_opts) { - int r; - char *o = NULL, *opts = NULL; - - r = fstab_filter_options(m->parameters_fragment.options, - "nofail\0" "noauto\0" "auto\0", NULL, NULL, &o); - if (r < 0) - return r; - - if (mac_smack_use() && m->smack_fs_root_label) { - if (!isempty(o)) { - opts = strjoin(o, ",", "smackfsroot=", m->smack_fs_root_label, NULL); - free(o); - } else - opts = strjoin("smackfsroot=", m->smack_fs_root_label, NULL); - - if (!opts) - return -ENOMEM; - } else - opts = o; - - *_opts = opts; - return 0; +static int mount_get_opts(Mount *m, char **ret) { + return fstab_filter_options(m->parameters_fragment.options, + "nofail\0" "noauto\0" "auto\0", NULL, NULL, ret); } static void mount_enter_mounting(Mount *m) { diff --git a/src/core/mount.h b/src/core/mount.h index b344b5aa13..83d14ae713 100644 --- a/src/core/mount.h +++ b/src/core/mount.h @@ -71,7 +71,6 @@ struct Mount { bool reset_cpu_usage:1; bool sloppy_options; - char *smack_fs_root_label; MountResult result; MountResult reload_result; diff --git a/units/tmp.mount.m4 b/units/tmp.mount.m4 index 6402200c62..00a0d28722 100644 --- a/units/tmp.mount.m4 +++ b/units/tmp.mount.m4 @@ -19,6 +19,3 @@ What=tmpfs Where=/tmp Type=tmpfs Options=mode=1777,strictatime -m4_ifdef(`HAVE_SMACK', -SmackFileSystemRootLabel=* -)m4_dnl |