1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Commit Graph

12040 Commits

Author SHA1 Message Date
Martin Pitt
db7c6e6fc8 keymap: Fix Dell vendor names
Spaces are dropped from vendor and product names in DMI modaliases, so a match
like "svnDell Inc.:" will never happen. Also, some machines use "Dell", some
"Dell Inc", some "Dell Inc.", so just match on "Dell*" to avoid all these
traps.

https://launchpad.net/bugs/1218433
2013-08-30 06:55:40 +02:00
Martin Pitt
3f42b51f21 keymap: Don't erase previous assignments
Don't use "KEYBOARD_KEY_xx=!" assignments (i. e. only enabling force-release)
if more general matches already explicitly set a key code before, to not
override the previously set value.

https://launchpad.net/bugs/1218433
2013-08-29 17:48:42 +02:00
Harald Hoyer
b58b8e11c5 Do not realloc strings, which are already in the hashmap as keys
This prevents corruption of the hashmap, because we would free() the
keys in the hashmap, if the unit is already in there, with the same
cgroup path.
2013-08-28 16:02:57 +02:00
Harald Hoyer
3d040cf244 Revert "cgroup.c: check return value of unit_realize_cgroup_now()"
This reverts commit 1f11a0cdfe.
2013-08-28 16:02:39 +02:00
Gao feng
a255a7f144 cgroup: only check once when mode is UNIT_CHECK
If the mode is UNIT_CHECK,it means we only want to check if
the paramaters are valid. the first round of cycle already
did this check, no need to check again.
2013-08-28 08:04:56 -04:00
Gao feng
ad7bfffde5 device cgroup: don't create a new CGroupDeviceAllow when it already in the list
If a device node is already in the device_allow list of
CGroupContext, we should replace it instead of create a
new one and append this new one to the end of device_allow
list.

change from v1: use streq to replace !strcmp
2013-08-28 08:04:56 -04:00
Gao feng
e862b60f1c blcokio bandwidth: add missing set of CGroupBlockIODeviceBandwidth's read
BlockIOReadBandwidth and BlockIOWriteBandwidth both use
config_parse_blockio_bandwidth to set up CGroupBlockIODeviceBandwidth,
We should set the read value based on the left values
in config files.
2013-08-28 08:04:56 -04:00
Zbigniew Jędrzejewski-Szmek
5af726cced logind-session.c: use _cleanup_ 2013-08-28 08:04:56 -04:00
Zbigniew Jędrzejewski-Szmek
042f598892 logind: be more verbose on errors 2013-08-28 08:04:56 -04:00
Zbigniew Jędrzejewski-Szmek
335c46b598 Disallow invalid UTF-8 configuration
It is best to catch such errors early. If invalid UTF-8 ends up being
given to dbus methods, the program will crash:

process 20801: arguments to dbus_message_iter_append_basic() were incorrect, assertion "_dbus_check_is_valid_utf8 (*string_p)" failed in file dbus-message.c line 2598.
2013-08-28 08:04:56 -04:00
Zbigniew Jędrzejewski-Szmek
fe05567c31 shell-completions: systemd-analyze set-log-level 2013-08-28 08:04:56 -04:00
Kay Sievers
bd6d296339 log to kmsg when "debug" is used on the kernel command line 2013-08-27 18:25:06 +02:00
Martin Pitt
792d616391 keymap: Add Logitech Internet Navigator variant [PID C309]
By Albrecht Kolthoff <kolthoff@gmx.net> via linux-hotplug@.
2013-08-27 12:57:01 +02:00
Martin Pitt
64b2a4da97 keymap: Add Samsung NP53U3C
https://launchpad.net/bugs/1203853
2013-08-26 16:49:10 +02:00
William Giokas
9e15a18acd zsh_completion: Fix --user-unit completion
_SYSTEMD_USER_UNIT in the --user-unit flag argument should instead be
USER_UNIT. It should also have an optional `=` between the flag and the
argument.
2013-08-24 13:17:43 -04:00
Herczeg Zsolt
93a279e34a Keyboard map for Samsung NP700Z3C
I'm using Ubuntu 13.04 on a Samsung Series 5 computer and found that that
Fn hotkeys does not work.
2013-08-23 15:17:15 -04:00
Zbigniew Jędrzejewski-Szmek
0f85cbe105 man: Small grammar fix
Use Oxford comma.
2013-08-23 13:13:12 -04:00
Zbigniew Jędrzejewski-Szmek
f1a5d37e08 keyboard: add eMachines E725
Information supplied by Ludvig <enthymeme@lavabit.com>.
2013-08-23 13:00:43 -04:00
William Giokas
862f4963c6 zsh_completion: Fix single letter args
Things like -n to specify the lines to show with systemctl and
journalctl accepts syntax like:

  journalctl -n4
  systemctl -n14

Previously, typing `-nXX <tab>` where XX is a number, zsh would try to
complete an integer. Now it will see the XX and use the _journalctl_none
completion. This is also how any of the single letter options that take
arguments work as well.
2013-08-23 12:48:14 -04:00
Maciej Wereski
ea92ae33e0 "-" prefix for InaccessibleDirectories and ReadOnlyDirectories 2013-08-23 12:48:14 -04:00
Shawn Landden
ac8e20c6e9 man: make reference to bind(2) explicit 2013-08-23 12:48:14 -04:00
Shawn Landden
7c902b1468 udev: fix printf(3) type specifier
src/udev/udev-rules.c: In function 'add_rule':
src/udev/udev-rules.c:1078:33: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'int' [-Wformat=]
                                 log_error("invalid key/value pair in file %s on line %u,"
                                 ^
2013-08-23 12:48:14 -04:00
Gao feng
f236910365 blkio: fix incorrect setting of cpu_shares
We should set up blockio_weight not cpu_shares.
2013-08-23 12:48:14 -04:00
Zbigniew Jędrzejewski-Szmek
d182614649 nspawn: trivial simplification 2013-08-23 12:48:14 -04:00
Harald Hoyer
1f11a0cdfe cgroup.c: check return value of unit_realize_cgroup_now()
do not recurse further, if unit_realize_cgroup_now() failed
2013-08-23 18:46:51 +02:00
Colin Walters
73814ca287 Revert "udevd: simplify sigterm check"
This reverts commit 47e737dc13 - it
introduced a use-after-free.  The only way the code would get simpler
is with a cleanup function, but eh, not worth it for just this one
bit.

Reviewed by kay on IRC.
2013-08-22 17:07:02 -04:00
Kay Sievers
df89481a35 Optimize startswith() to macro
I guess it's easier and cleaner anyway to use simple static inline
functions instead of defines.
2013-08-22 00:52:14 -04:00
Shawn Landden
2a0e069256 remove hasprefix(), use startswith() 2013-08-22 00:52:14 -04:00
Khem Raj
67c15b9a7a use CAP_MKNOD ConditionCapability
Fixes errors seen when booting VMs on QEMU like

systemd[1]: kmod-static-nodes.service: main process exited, code=exited, status=203/EXEC
systemd[1]: Failed to start Create list of required static device nodes for the current kernel.
systemd[1]: Unit kmod-static-nodes.service entered failed state.

Make sure that mknod capability is available

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2013-08-22 00:52:14 -04:00
Zbigniew Jędrzejewski-Szmek
d83c224da0 man: typo
ohsix> ooh theres a typo in the example
2013-08-22 00:52:14 -04:00
Holger Hans Peter Freyther
143bfdaf0b test: Make testing work on systems without or old systemd
* Introduce a macro to conditionally execute tests. This avoids
  skipping the entire test if some parts require systemd
* Skip the journal tests when no /etc/machine-id is present
* Change test-catalog to load the catalog from the source directory
  of systemd.
* /proc/PID/comm got introduced in v2.6.33 but travis is still
  using v2.6.32.
* Enable make check and make distcheck on the travis build
* Use -D"CATALOG_DIR=STR($(abs_top_srcdir)/catalog)" as a STRINGIY
  would result in the path '/home/ich/source/linux' to be expanded
  to '/home/ich/source/1' as linux is defined to 1.
2013-08-22 00:52:14 -04:00
Kay Sievers
67ccd1c4b8 remove freenode verification file 2013-08-21 14:11:43 +02:00
Kay Sievers
0611ef5cc1 add freenode verification 2013-08-21 13:10:40 +02:00
Zbigniew Jędrzejewski-Szmek
2526d62691 logs-show: fix condition for ellipsizing multi-line messages
falconindy> the ellipsizing seems a bit wrong here....

I got a bit carried away with putting dots everywhere :)
2013-08-21 01:36:51 -04:00
Zbigniew Jędrzejewski-Szmek
cf40f0be1a logs-show: show source timestamp in verbose mode
This makes verbose behave like short mode, i.e. try to show
the source timestamp, and fall back to journald timestamp
only if unavailable or unparsable. I think verbose should
be like short, only showing more fields, and showing different
timestamps would be confusing.
2013-08-20 21:18:44 -04:00
Zbigniew Jędrzejewski-Szmek
f02d836794 logs-show: add short-precise mode with us timestamps
Also, always show us timestamps in verbose mode.

https://bugzilla.redhat.com/show_bug.cgi?id=991678
2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
c51cf05646 Rename F_TYPE_CMP() to F_TYPE_EQUAL() 2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
e7627e14dc keymap: add Pavilion dv7 keys 2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
1291bc895b udev: when complaining about invalid characters, print them out
systemd-udevd[6260]: invalid key/value pair in file /usr/lib/udev/rules.d/60-ffado.rules on line 46,starting at character 84 ('#')
2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
091526ab20 gpt-auto-generator: do not show error for non-GPT disks 2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
7384146530 gpt-auto-generator: use _cleanup_ for blkid_free_probe 2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
d98cc1c019 gpt-auto-generator: include device name in error reports 2013-08-20 21:18:43 -04:00
Zbigniew Jędrzejewski-Szmek
219061dc52 units: disable kmod-static-nodes.service in containers
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=998122.

Note: upstream kmod has a patch [1] to exit with a warning if
modules.devname is missing. We could use new %v specifier to make this
service conditional on the existence of this file, but this could
mask a kernel installation error, hence we should let kmod run
even if the file doesn't exist.

[1] http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=ae17710117
2013-08-20 21:18:00 -04:00
Zbigniew Jędrzejewski-Szmek
04ac799283 man: fix spacing issue in systemd-nspawn(1)
Same as 1e158d273.
2013-08-19 16:00:22 -04:00
Zbigniew Jędrzejewski-Szmek
58a25dac28 build-sys: use no-tmpl flavour of gtkdocization
"tmpl" flavour is deprecated. Also this way we avoid a warning during
installation with older gtkdoc.

https://bugzilla.gnome.org/show_bug.cgi?id=701259
2013-08-19 11:30:04 -04:00
Zbigniew Jędrzejewski-Szmek
ac50788b0f journal: fix parsing of facility in syslog messages
In 49998b383 (journald: do not overwrite syslog facility when
parsing priority) journald started ignoring facility part when
reading service stderr to convert to syslog messages. In this
case it is fine, because only the priority is allowed.

But the same codepath is used for syslog messages, where the
facility should be used. Split the two codepaths by explicitly
specyfing whether the facility should be ignored or not.

https://bugzilla.redhat.com/show_bug.cgi?id=988814
2013-08-19 11:14:14 -04:00
Harald Hoyer
763a24a3b6 libudev-enumerate.c:udev_enumerate_get_list_entry() fixed possible stale pointer
If a realloc() happens in syspath_add(), the move_later pointer could
point to an invalid memory region.

Let move_later store the array index, instead of the pointer to the
entry.
2013-08-19 15:21:49 +02:00
Kay Sievers
4bb3a126b7 udev: replace CAP_MKNOD by writable /sys condition 2013-08-17 19:07:42 +02:00
Michael Marineau
4b357e1587 build-sys: Add configure check for linux/btrfs.h
btrfs.h was added to uapi in Linux 3.9. To fix building with older
header versions this adds a configure check for the header and re-adds
btrfs definitions to missing.h which was removed in bed2e820 along with
two other ioctls used by gpt-auto-generator.

[ Apparently, btrfs.h was only added recently:
  http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=55e301fd57a6239ec14b91a1cf2e70b3dd135194
  let's re-add it for now -- kay ]
2013-08-16 23:29:41 +02:00
Zbigniew Jędrzejewski-Szmek
d0a2d726f0 units: make fsck units remain after exit
Without this, fsck would be re-run if any other service which pulls
in a target requiring one of the mounts was started after fsck was done
but before the initial transaction was done.

https://bugs.freedesktop.org/show_bug.cgi?id=66784
2013-08-15 15:42:09 -04:00