Commit Graph

15526 Commits

Author SHA1 Message Date
Thomas Hindoe Paaboel Andersen af67487dbe sysv-generator: fix incorect ordering of Wants
(cherry picked from commit 260ad50f5b)
2014-06-26 01:48:15 -04:00
Thomas Hindoe Paaboel Andersen 6b6202305b sysv-generator: rename PidFile to PIDFile
Spotted by Alexey Shabalin

(cherry picked from commit d171ed1c50)
2014-06-26 01:47:35 -04:00
Zbigniew Jędrzejewski-Szmek e63577bbbb man: fix path in crypttab(5)
https://bugs.freedesktop.org/show_bug.cgi?id=75816
(cherry picked from commit 9fcdf32294)
2014-06-26 01:46:59 -04:00
Lennart Poettering 2acc158f96 cryptsetup: don't add unit dependency on /dev/null devices when it is listed as password file
As special magic, don't create device dependencies for /dev/null. Of
course, there might be similar devices we might want to include, but
given that none of them really make sense to specify as password source
there's really no point in checking for anything else here.

https://bugs.freedesktop.org/show_bug.cgi?id=75816
(cherry picked from commit bde29068aa)
2014-06-26 01:46:44 -04:00
Ronan Le Martret d94362708d core: You can not put the cached result of use_smack fct, as we are not sure the "/sys" is mounted. So we should mount "sys" before "/proc"
https://bugs.freedesktop.org/show_bug.cgi?id=77646
(cherry picked from commit d1d8e5d49f)
2014-06-26 01:46:39 -04:00
Hristo Venev 4af1100591 core: make sure Environment fields passed in for transient units are properly written to unit files
https://bugs.freedesktop.org/show_bug.cgi?id=76744
(cherry picked from commit cdd7b7dfd4)
2014-06-26 01:46:32 -04:00
Carl Schaefer 41d83615be vconsole: also copy character maps (not just fonts) from vt1 to vt2, vt3, ...
https://bugs.freedesktop.org/show_bug.cgi?id=78796
(cherry picked from commit ff452e76e2)
2014-06-26 01:46:24 -04:00
Zbigniew Jędrzejewski-Szmek e7c2e475be core/snapshot: log info when snapshots are created and removed
Snapshot mechanism is not used very much, but snapshot creation/destruction
should be at least as verbose as normal unit starting/stopping.

(cherry picked from commit 6f8bd5c94e)

Conflicts:
	TODO
2014-06-26 01:45:45 -04:00
Zbigniew Jędrzejewski-Szmek 54791e4aa3 core/transaction: avoid misleading error message when unit not found
There's no point in telling the user to look at the logs when
an attempt to load the unit file failed with ENOENT.

https://bugzilla.redhat.com/show_bug.cgi?id=996133
(cherry picked from commit 04ef5b03f6)

Conflicts:
	TODO
2014-06-26 01:45:23 -04:00
Zbigniew Jędrzejewski-Szmek 51b5c543f4 core/transaction: reindent and split very long lines
(cherry picked from commit 9ba6c18532)
2014-06-26 01:44:54 -04:00
Jonathan Boulle b180448823 fix systemd-resolved reference in man page
Guess this was missed in the copy-paste :-)

(cherry picked from commit 40ef48600f)
2014-06-26 01:44:22 -04:00
Ronny Chevalier d8d15d1a6e build-sys: add -pthread flag for libsystemd-shared
src/shared/async.c uses pthread so it will fail at link time if we link
only to libsystemd-shared and use async

(cherry picked from commit 8e75477abd)
2014-06-22 23:57:25 -04:00
Zbigniew Jędrzejewski-Szmek 7da3a022eb util: treat fuse.sshfs as a network filesystem
https://bugs.freedesktop.org/show_bug.cgi?id=73727
(cherry picked from commit da92ca5eb5)
2014-06-22 23:57:25 -04:00
Zbigniew Jędrzejewski-Szmek 2e7e020156 missing.h: add various network enums
We used to check if e.g. IFLA_BOND_MAX is defined and provide fallback
values in missing.h is it wasn't. But over time, various kernel
versions added IFLA_* defines, so checking for IFLA_BOND_MAX is not
enough if the kernel is new enough to have some of them but too old to
have all. In case we detect that the latest known enum value is
missing, #define most of them.

https://bugs.freedesktop.org/show_bug.cgi?id=80095
(cherry picked from commit 81577dc228)

Conflicts:
	src/network/networkd-vxlan.c
2014-06-22 23:57:23 -04:00
Zbigniew Jędrzejewski-Szmek 82d568e88c util: do not strip /dev prefix twice
(cherry picked from commit 0d460faf73)
2014-06-22 23:57:08 -04:00
Michael Marineau 695c8554ca shared: fix search_and_fopen with alternate roots
Update for the current behavior of path_strv_resolve which now returns
paths relative to the given root, not the full absolute paths.

(cherry picked from commit 375eadd911)
2014-06-22 23:57:08 -04:00
Michael Marineau 3db5dbae9f conf-files: include root in returned file paths
This restores the original root handling logic that was present prior to
112cfb18 when path expansion moved to path_strv_canonicalize_absolute.
That behavior partially went away in 12ed81d9.

Alternatively all users of conf_files_list* could be updated to
concatenate the paths themselves as unit_file_query_preset did but since
no user needs the un-concatenated form that is pointless duplication.

(cherry picked from commit cba2ef0272)

Conflicts:
	src/shared/install.c
2014-06-22 22:54:58 -04:00
Michael Marineau a1a4a0201b shared: rename path_strv_canonicalize_absolute functions
Since 12ed81d9 path_strv_canonicalize_absolute leaves the search list
relative to the given root directory instead of resolving paths to their
true location as the name implies. To better reflect this behavior
rename to the less strongly worded path_strv_resolve.

(cherry picked from commit 7d8da2c964)
2014-06-22 22:52:56 -04:00
Zbigniew Jędrzejewski-Szmek d7671242e5 getty-generator: properly escape instance names
Otherwise the add_symlink() function tries to make directories for
each slash even for the slash after the @ symbol in the final link
name, failing for /dev/3270/tty1.

Based on a patch by Werner Fink <werner@suse.de>.

(cherry picked from commit a2ae516a25)
2014-06-22 22:52:48 -04:00
Zbigniew Jędrzejewski-Szmek c79a00436c man: also describe an udev rule for bridge sysctl
(cherry picked from commit 7141829512)
2014-06-22 22:52:37 -04:00
Zbigniew Jędrzejewski-Szmek 59fccb9cb4 man: document statically loading modules for sysctl settings
https://bugzilla.redhat.com/show_bug.cgi?id=1022977
https://bugzilla.novell.com/show_bug.cgi?id=725412
(cherry picked from commit 7284335adb)
2014-06-22 22:52:37 -04:00
Cristian Rodríguez 4564424c0a units/systemd-sysctl.service.in: run after load-modules
Modules might or will register new sysctl options.

[zj: This mechanism of adding modules just to reliably set sysctl
attributes is not ideal. Nevertheless, sysctl for dynamically created
attributes is simply broken, and this is the easiest workaround.]

https://bugzilla.redhat.com/show_bug.cgi?id=1022977
https://bugzilla.novell.com/show_bug.cgi?id=725412
(cherry picked from commit 0b73eab7a2)
2014-06-22 22:52:22 -04:00
Lennart Poettering 70a3698b99 units: add missing caps so that GetAddresses() can work
(cherry picked from commit a55954297d)
2014-06-22 22:51:38 -04:00
Ronny Chevalier 5f1d6b4795 man: fix typo
(cherry picked from commit 08d555f347)
2014-06-22 22:50:33 -04:00
Thomas Hindoe Paaboel Andersen 29d5bac956 socket: check return from exec_spawn
(cherry picked from commit cee288adf8)
2014-06-22 22:49:34 -04:00
Marcel Holtmann 60ab4dd0d5 hwdb: Update database of Bluetooth company identifiers
(cherry picked from commit 7cfa80f07e)
2014-06-22 22:49:20 -04:00
Kay Sievers 54687582eb rules: add loop-control and btrfs-control to "disk" group
(cherry picked from commit 27e7c26268)
2014-06-22 22:49:12 -04:00
Lennart Poettering ed56789039 cryptsetup: introduce new cryptsetup-pre.traget unit so that services can make sure they are started before and stopped after any LUKS setup
https://bugzilla.redhat.com/show_bug.cgi?id=1097938
(cherry picked from commit 9542239eaf)
2014-06-22 22:49:07 -04:00
Lennart Poettering 2254916227 tmpfiles: create directories already with the right label, instead of creating them first, and relabeling them afterwards
(cherry picked from commit 6f04529399)
2014-06-22 22:49:02 -04:00
Lennart Poettering 415796b702 namespace: properly label device nodes we create
https://bugzilla.redhat.com/show_bug.cgi?id=1081429
(cherry picked from commit dd078a1ef8)
2014-06-22 22:48:53 -04:00
Ronny Chevalier 4b700b54f5 build-sys: add missing backslash
(cherry picked from commit fe582db94b)
2014-06-22 22:48:23 -04:00
Frederic Crozat 985c32b771 bootchart: set white background
In programs like eog and gimp the transparant background did not
look very good.

Similar fix from the one done in systemd-analyze (418e3750)

(cherry picked from commit a7997073ac)
2014-06-22 22:48:12 -04:00
Lennart Poettering 12c375aeca networkd: don't pull in systemd-networkd-wait-online service from systemd-networkd when enabling
networkd-wait-online should never exist in the default transaction,
unless explicitly enable or pulled in via things like NFS. However, just
enabling networkd shouldn't enable networkd-wait-online, since it's
common to use the former without the latter.

(cherry picked from commit 324d7a53b9)
2014-06-22 22:47:55 -04:00
Lennart Poettering 90df11b158 conf-files: fix when for --root= logic
This is based on parts of similar patches from Michael Marineau and
Lukas Nykrin, but simply uses strappenda3().

(cherry picked from commit cebed5005b)
2014-06-22 22:47:43 -04:00
Lennart Poettering 7e1db29dde install: simplify symlink --root= logic
(cherry picked from commit 278fa5758c)
2014-06-22 22:47:21 -04:00
Lennart Poettering 09fcc5cffa log: don't downgrade log level in non-PID 1 if "quiet" is passed on kernel cmdline
"debug" should apply to all tools, but "quiet" only to PID1.

(cherry picked from commit d7b15e0a01)
2014-06-22 22:47:02 -04:00
Lennart Poettering c88a943a73 install: make sure that --root= mode doesn't make us consider all units outside of search path
(cherry picked from commit 8f294b45cb)
2014-06-22 22:46:56 -04:00
Lennart Poettering 90d1640442 install: make sure "systemctl disable foobar@.service" actually removes all instances
(cherry picked from commit 559367add5)
2014-06-22 22:46:51 -04:00
Lennart Poettering acefb01e35 install: when looking for a unit file for enabling, search for templates only after traversing all search directories
Let's always make sure to look in all search directories for the full
unit names first, before looking for templates for them.

(cherry picked from commit e50bd77516)
2014-06-22 22:46:03 -04:00
Lennart Poettering b533ed36a5 install: use symlink_atomic() instead of unlink()+symlink() when force creating a symlink
(cherry picked from commit 1f8c46040e)
2014-06-22 22:45:58 -04:00
Lennart Poettering f906059875 install: various modernizations
(cherry picked from commit 1dacfd2ad6)
2014-06-22 22:37:48 -04:00
Lennart Poettering bf160761cd install: simplify and clarify disabling logic for instanced units
(cherry picked from commit bcafe923a7)
2014-06-22 22:37:36 -04:00
Lennart Poettering 06cd279be2 install: various modernizations
(cherry picked from commit da39f6a63e)
2014-06-22 22:37:36 -04:00
Lennart Poettering 3e59dbfced unit-name: fix detection of unit templates/instances
We need to check for the last dot, not the first one in a unit name, for
the suffix. Correct that.

(cherry picked from commit 6ef9eeed61)
2014-06-22 22:37:01 -04:00
Thomas Hindoe Paaboel Andersen 84d1cd0b9b journal-remote: fix memleak
(cherry picked from commit e94b5a7bc2)
2014-06-22 22:36:53 -04:00
Lennart Poettering 1d4d5cd68c core: clean-up signal reset logic when reexec
There's no need to save the old sigmask, if we are going to die. Let's
simplify this. Also, reset all the signal handlers, so that we don't
leave SIG_IGN set for some of them across reexec.

(cherry picked from commit 9bfcda9528)
2014-06-22 22:36:45 -04:00
Ruediger Oertel ab25a48521 Reset signal-mask on re-exec to init=..
Process 1 (aka init) needs to be started with an empty signal mask.
That includes the process 1 that's started after the initrd is finished.
When the initrd is using systemd (as it does with dracut based initrds)
then it is systemd that calls the real init.  Normally this is systemd
again, except when the user uses for instance "init=/bin/bash" on the
kernel command line.

(cherry picked from commit 5a85ca1cb6)
2014-06-22 22:32:19 -04:00
Lennart Poettering 5aef99701f tmpfiles: set up selinux label proeprly when creating fifos
(cherry picked from commit 45c196a76b)

Conflicts:
	src/shared/util.c
2014-06-22 22:32:04 -04:00
Colin Ian King 0da84688a4 Fix spelling mistake, scirpt --> script
(cherry picked from commit 855d111304)
2014-06-22 22:31:11 -04:00
Lennart Poettering 3c96e9e075 rpm: don't hardcode the binary paths in the macros, rely on $PATH
this gives us a little bit more freedom to move things around later on,
as we don't hardcode the systemd paths in old RPMs that shall work with
new systemds.

(cherry picked from commit 8cf7c96517)
2014-06-22 22:30:19 -04:00