Michal Sekletar 7aad67e7f2 core: look for instance when processing template name ...

If first attempt to merge units failed and we are trying to do
merge the other way around and at the same time we are working with
template name, then other unit can't possibly be template, because it is
not possible to have template unit running, only instances of the
template. Thus we need to look for already active instance instead.

2016-03-16 15:40:14 +01:00

..

ac-power

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

activate

tree-wide: make ++/-- usage consistent WRT spacing

2016-02-22 20:32:04 -08:00

analyze

Merge pull request #2671 from 0xAX/move-pager-open-to-one-place

2016-02-25 15:29:59 -05:00

ask-password

ask-password: add option --no-output to not print password to stdout

2016-03-01 19:02:11 +01:00

backlight

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

basic

Merge pull request #2797 from evverx/selinux-use-raw

2016-03-16 01:13:29 -04:00

binfmt

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

boot

tree-wide: minor formatting inconsistency cleanups

2016-02-23 14:20:34 -08:00

cgls

tree-wide: merge pager_open_if_enabled() to the pager_open()

2016-02-26 01:13:23 +06:00

cgroups-agent

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

cgtop

tree-wide: make more global variables static

2016-02-13 12:28:28 +01:00

core

core: look for instance when processing template name

2016-03-16 15:40:14 +01:00

coredump

Merge pull request #2671 from 0xAX/move-pager-open-to-one-place

2016-02-25 15:29:59 -05:00

cryptsetup

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

dbus1-generator

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

debug-generator

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

delta

Merge pull request #2671 from 0xAX/move-pager-open-to-one-place

2016-02-25 15:29:59 -05:00

detect-virt

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

escape

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

firstboot

firstboot: use laccess macro instead of facessat()

2016-03-06 13:27:59 +06:00

fsck

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

fstab-generator

fstab-generator: fix automount option and don't start associated mount unit at boot

2016-03-04 22:09:08 +01:00

getty-generator

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

gpt-auto-generator

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

hibernate-resume

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

hostname

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

hwdb

…

import

import: don't claim we had copied a settings file if we didn't

2016-02-21 20:40:57 +01:00

initctl

tree-wide: make ++/-- usage consistent WRT spacing

2016-02-22 20:32:04 -08:00

journal

test-compress-benchmark: skip loop iteration if size is 0

2016-03-04 21:46:47 -05:00

journal-remote

tree-wide: minor formatting inconsistency cleanups

2016-02-23 14:20:34 -08:00

kernel-install

…

libsystemd

sd-path: use XDG_CONFIG_HOME instead of hardcoding ~/.config for user-dirs

2016-03-15 04:09:44 +00:00

libsystemd-network

DHCP DUID and IAID configurability

2016-03-09 21:58:44 -08:00

libudev

include sys/sysmacros.h in more places

2016-03-14 23:29:10 -04:00

locale

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

login

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

machine

Merge pull request #2671 from 0xAX/move-pager-open-to-one-place

2016-02-25 15:29:59 -05:00

machine-id-setup

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

modules-load

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

network

DHCP DUID and IAID configurability

2016-03-09 21:58:44 -08:00

notify

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

nspawn

/dev/console must be labeled with SELinux label

2016-03-09 11:19:45 -05:00

nss-myhostname

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

nss-mymachines

tree-wide: make ++/-- usage consistent WRT spacing

2016-02-22 20:32:04 -08:00

nss-resolve

tree-wide: make ++/-- usage consistent WRT spacing

2016-02-22 20:32:04 -08:00

path

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

quotacheck

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

random-seed

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

rc-local-generator

tree-wide: make more global variables static

2016-02-13 12:28:28 +01:00

remount-fs

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

reply-password

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

resolve

tree-wide: use SET_FLAG() macro to make code more clear

2016-03-05 18:26:01 +06:00

rfkill

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

run

run: Improve the help message about timer options and existing units

2016-03-12 11:50:34 +01:00

shared

shared/machine-pool: fix another mkfs.btrfs checking

2016-03-14 00:54:35 +00:00

sleep

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

socket-proxy

tree-wide: make ++/-- usage consistent WRT spacing

2016-02-22 20:32:04 -08:00

stdio-bridge

stdio-bridge: Correctly propagate error

2016-02-29 10:45:34 +01:00

sysctl

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

system-update-generator

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

systemctl

Merge pull request #2768 from benjarobin/fix-2718

2016-03-07 14:50:08 +01:00

systemd

include sys/sysmacros.h in more places

2016-03-14 23:29:10 -04:00

sysusers

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

sysv-generator

tree-wide: minor formatting inconsistency cleanups

2016-02-23 14:20:34 -08:00

test

test-ipcrm: fix log message

2016-03-10 12:57:23 +01:00

timedate

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

timesync

clock-util: make clock_is_localtime() testable and add initial tests

2016-02-26 11:28:49 +01:00

tmpfiles

tree-wide: use SET_FLAG() macro to make code more clear

2016-03-05 18:26:01 +06:00

tty-ask-password-agent

Merge pull request #2495 from heftig/master

2016-02-10 16:53:49 +01:00

udev

include sys/sysmacros.h in more places

2016-03-14 23:29:10 -04:00

update-done

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

update-utmp

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

user-sessions

selinux: always try to load the full selinux db

2016-03-01 20:39:30 -05:00

vconsole

tree-wide: remove Emacs lines from all files

2016-02-10 13:41:57 +01:00

.gitignore

…

Makefile

…