[systemd-commits] Makefile.am units/.gitignore units/systemd-static-nodes.service.in units/systemd-tmpfiles-setup-dev.service.in

[Tom Gundersen]

 Makefile.am                                 |    8 +++-----
 units/.gitignore                            |    2 +-
 units/systemd-static-nodes.service.in       |   16 ----------------
 units/systemd-tmpfiles-setup-dev.service.in |   16 ++++++++++++++++
 4 files changed, 20 insertions(+), 22 deletions(-)

New commits:
commit 3e8037f17c985a99b26fff92917e8567480ab246
Author: Tom Gundersen <teg at jklm.no>
Date:   Mon Apr 22 21:57:39 2013 +0200

    units: rename systemd-static-nodes -> systemd-tmpfiles-setup-dev
    
    This is really just a special case of systemd-tmpfiles-setup, moreover it could easily create more than static nodes.

diff --git a/Makefile.am b/Makefile.am
index d594a3d..1e155d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -416,6 +416,7 @@ nodist_systemunit_DATA = \
 	units/systemd-remount-fs.service \
 	units/systemd-update-utmp-runlevel.service \
 	units/systemd-update-utmp-shutdown.service \
+	units/systemd-tmpfiles-setup-dev.service \
 	units/systemd-tmpfiles-setup.service \
 	units/systemd-tmpfiles-clean.service \
 	units/systemd-ask-password-wall.service \
@@ -433,7 +434,6 @@ nodist_systemunit_DATA = \
 	units/systemd-kexec.service \
 	units/systemd-fsck at .service \
 	units/systemd-fsck-root.service \
-	units/systemd-static-nodes.service \
 	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
@@ -461,6 +461,7 @@ EXTRA_DIST += \
 	units/systemd-remount-fs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
 	units/systemd-update-utmp-shutdown.service.in \
+	units/systemd-tmpfiles-setup-dev.service.in \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in \
 	units/systemd-ask-password-wall.service.in \
@@ -475,7 +476,6 @@ EXTRA_DIST += \
 	units/systemd-fsck at .service.in \
 	units/systemd-fsck-root.service.in \
 	units/user at .service.in \
-	units/systemd-static-nodes.service \
 	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
@@ -1952,13 +1952,11 @@ CLEANFILES += \
 	src/udev/udev.pc
 
 EXTRA_DIST += \
-	units/systemd-static-nodes.service.in \
 	units/systemd-udevd.service.in \
 	units/systemd-udev-trigger.service.in \
 	units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-	units/systemd-static-nodes.service \
 	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service
@@ -1967,7 +1965,6 @@ SOCKETS_TARGET_WANTS += \
 	systemd-udevd-control.socket \
 	systemd-udevd-kernel.socket
 SYSINIT_TARGET_WANTS += \
-	systemd-static-nodes.service \
 	systemd-udevd.service \
 	systemd-udev-trigger.service
 
@@ -4021,6 +4018,7 @@ SYSINIT_TARGET_WANTS += \
 	sys-kernel-config.mount \
 	sys-kernel-debug.mount \
 	sys-fs-fuse-connections.mount \
+	systemd-tmpfiles-setup-dev.service \
 	systemd-tmpfiles-setup.service \
 	systemd-sysctl.service \
 	systemd-ask-password-console.path
diff --git a/units/.gitignore b/units/.gitignore
index 6c9582e..d2f3eb4 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -26,6 +26,7 @@
 /systemd-fsck-root.service
 /systemd-tmpfiles-clean.service
 /systemd-tmpfiles-setup.service
+/systemd-tmpfiles-setup-dev.service
 /systemd-halt.service
 /systemd-poweroff.service
 /systemd-reboot.service
@@ -43,7 +44,6 @@
 /systemd-random-seed-load.service
 /systemd-random-seed-save.service
 /systemd-initctl.service
-/systemd-static-nodes.service
 /getty at .service
 /systemd-update-utmp-runlevel.service
 /systemd-update-utmp-shutdown.service
diff --git a/units/systemd-static-nodes.service.in b/units/systemd-static-nodes.service.in
deleted file mode 100644
index 3553226..0000000
--- a/units/systemd-static-nodes.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Create static device nodes in /dev
-DefaultDependencies=no
-Before=sysinit.target systemd-udevd.service
-ConditionCapability=CAP_MKNOD
-
-[Service]
-Type=oneshot
-ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create
diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
new file mode 100644
index 0000000..3553226
--- /dev/null
+++ b/units/systemd-tmpfiles-setup-dev.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Create static device nodes in /dev
+DefaultDependencies=no
+Before=sysinit.target systemd-udevd.service
+ConditionCapability=CAP_MKNOD
+
+[Service]
+Type=oneshot
+ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create