login: move seat udev rules to login subdir

diff --git a/Makefile.am b/Makefile.am
index be5e70c9f85f87650249dbb3be03e88d99403fe9..1df603ba60c5b781fead5ff89de501d8589de4fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ pkginclude_HEADERS =
 lib_LTLIBRARIES =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
+dist_udevrules_DATA =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -222,11 +223,7 @@ dist_dbuspolicy_DATA = \
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service
 
-dist_udevrules_DATA = \
-       src/71-seat.rules
-
 nodist_udevrules_DATA = \
-       src/73-seat-late.rules \
        src/99-systemd.rules
 
 dbusinterface_DATA = \
@@ -370,7 +367,6 @@ EXTRA_DIST += \
        units/user@.service.in \
        src/systemd.pc.in \
        introspect.awk \
-       src/73-seat-late.rules.in \
        src/99-systemd.rules.in \
        man/custom-html.xsl
 
@@ -1861,11 +1857,11 @@ rootlibexec_PROGRAMS += \
 
 systemd_loginctl_SOURCES = \
        src/login/loginctl.c \
+       src/login/sysfs-show.c \
        src/dbus-common.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
-       src/pager.c \
-       src/sysfs-show.c
+       src/pager.c
 
 systemd_loginctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2017,7 +2013,13 @@ rootlibexec_PROGRAMS += \
        systemd-uaccess
 
 dist_udevrules_DATA += \
-       src/70-uaccess.rules
+       src/login/70-uaccess.rules
+
+dist_udevrules_DATA += \
+       src/login/71-seat.rules
+
+nodist_udevrules_DATA += \
+       src/login/73-seat-late.rules
 
 MANPAGES += \
        man/systemd-logind.conf.5 \
@@ -2063,8 +2065,6 @@ man/sd_get_uids.3: man/sd_get_seats.3
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
-       units/systemd-logind.service.in \
-       units/systemd-user-sessions.service.in \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
        src/login/logind.h \
@@ -2072,10 +2072,14 @@ EXTRA_DIST += \
        src/login/logind-seat.h \
        src/login/logind-session.h \
        src/login/logind-user.h \
-       src/login/logind-acl.h
+       src/login/logind-acl.h \
+       src/login/73-seat-late.rules.in \
+       units/systemd-logind.service.in \
+       units/systemd-user-sessions.service.in
 
 CLEANFILES += \
-       src/login/logind-gperf.c
+       src/login/logind-gperf.c \
+       src/login/73-seat-late.rules
 endif
 # ------------------------------------------------------------------------------
 
@@ -2152,11 +2156,10 @@ CLEANFILES += \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA) \
-       src/73-seat-late.rules \
-       src/99-systemd.rules \
        src/load-fragment-gperf.gperf \
        src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c
+       src/load-fragment-gperf-nulstr.c \
+       src/99-systemd.rules
 
 if HAVE_VALAC
 CLEANFILES += \

diff --git a/src/.gitignore b/src/.gitignore
index c54c6f65147f604f30cf6694bd8acdf0389cf5a6..4b123f86d213ea00aa8426f1946b369ee13cc66f 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -3,14 +3,9 @@ load-fragment-gperf-nulstr.c
 load-fragment-gperf.c
 load-fragment-gperf.gperf
 org.freedesktop.systemd1.policy.in
-99-systemd.rules
-org.freedesktop.hostname1.policy
-org.freedesktop.locale1.policy
-org.freedesktop.login1.policy
-org.freedesktop.timedate1.policy
 org.freedesktop.systemd1.policy
 gnome-ask-password-agent.c
 systemd-interfaces.c
 systemadm.c
 wraplabel.c
-73-seat-late.rules
+99-systemd.rules

diff --git a/src/hostname/.gitignore b/src/hostname/.gitignore
new file mode 100644 (file)
index 0000000..1ff281b
--- /dev/null
+++ b/src/hostname/.gitignore
@@ -0,0 +1 @@
+org.freedesktop.hostname1.policy

diff --git a/src/locale/.gitignore b/src/locale/.gitignore
new file mode 100644 (file)
index 0000000..b1e0ba7
--- /dev/null
+++ b/src/locale/.gitignore
@@ -0,0 +1 @@
+org.freedesktop.locale1.policy

diff --git a/src/login/.gitignore b/src/login/.gitignore
index 7c420cb09b03e4eace2f193aaacd6f965dd741ce..1c0f3995ed5c5b68eaaf50d6ea2afe4c1b206cbb 100644 (file)
--- a/src/login/.gitignore
+++ b/src/login/.gitignore
@@ -1 +1,3 @@
 logind-gperf.c
+org.freedesktop.login1.policy
+73-seat-late.rules

diff --git a/src/70-uaccess.rules b/src/login/70-uaccess.rules
similarity index 100%
rename from src/70-uaccess.rules
rename to src/login/70-uaccess.rules

diff --git a/src/71-seat.rules b/src/login/71-seat.rules
similarity index 100%
rename from src/71-seat.rules
rename to src/login/71-seat.rules

diff --git a/src/73-seat-late.rules.in b/src/login/73-seat-late.rules.in
similarity index 100%
rename from src/73-seat-late.rules.in
rename to src/login/73-seat-late.rules.in

diff --git a/src/sysfs-show.c b/src/login/sysfs-show.c
similarity index 100%
rename from src/sysfs-show.c
rename to src/login/sysfs-show.c

diff --git a/src/timedate/.gitignore b/src/timedate/.gitignore
new file mode 100644 (file)
index 0000000..48757f0
--- /dev/null
+++ b/src/timedate/.gitignore
@@ -0,0 +1 @@
+org.freedesktop.timedate1.policy