[systemd-devel] [PATCH 2/3] Made test-enabled units more basic, removing superfluous fields.
Ken Sedgwick
ksedgwic at bonsai.com
Tue Oct 7 12:11:48 PDT 2014
---
test/test-enabled-root/etc/systemd/system/some.target | 6 +-----
test/test-enabled-root/run/systemd/system/other.target | 3 +--
test/test-enabled-root/usr/lib/systemd/system/another.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/disabled.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/masked.service | 7 ++-----
.../test-enabled-root/usr/lib/systemd/system/maskedruntime.service | 7 ++-----
.../usr/lib/systemd/system/maskedruntimestatic.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/maskedstatic.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/runtime.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/static.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/templating at .service | 7 ++-----
.../usr/lib/systemd/system/templating at three.service | 7 ++-----
.../usr/lib/systemd/system/templating at two.service | 7 ++-----
test/test-enabled-root/usr/lib/systemd/system/unique.service | 7 ++-----
14 files changed, 26 insertions(+), 67 deletions(-)
diff --git a/test/test-enabled-root/etc/systemd/system/some.target
b/test/test-enabled-root/etc/systemd/system/some.target
index a2c4532..06eb04e 100644
--- a/test/test-enabled-root/etc/systemd/system/some.target
+++ b/test/test-enabled-root/etc/systemd/system/some.target
@@ -6,10 +6,6 @@
# (at your option) any later version.
[Unit]
-Description=Graphical Interface
-Documentation=man:systemd.special(7)
+Description=Some sort of target.
Requires=multi-user.target
After=multi-user.target
-Conflicts=rescue.target
-Wants=display-manager.service
-AllowIsolate=yes
diff --git a/test/test-enabled-root/run/systemd/system/other.target
b/test/test-enabled-root/run/systemd/system/other.target
index a2c4532..0f54eb3 100644
--- a/test/test-enabled-root/run/systemd/system/other.target
+++ b/test/test-enabled-root/run/systemd/system/other.target
@@ -6,8 +6,7 @@
# (at your option) any later version.
[Unit]
-Description=Graphical Interface
-Documentation=man:systemd.special(7)
+Description=Other Target
Requires=multi-user.target
After=multi-user.target
Conflicts=rescue.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/another.service
b/test/test-enabled-root/usr/lib/systemd/system/another.service
index 669548a..e4ea7f3 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/another.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/another.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Another Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Another Service Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/disabled.service
b/test/test-enabled-root/usr/lib/systemd/system/disabled.service
index 669548a..f1d1fc6 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/disabled.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/disabled.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Disabled Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Disabled Service Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/masked.service
b/test/test-enabled-root/usr/lib/systemd/system/masked.service
index 669548a..7a64302 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/masked.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/masked.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Masked Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Masked Service Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/maskedruntime.service
b/test/test-enabled-root/usr/lib/systemd/system/maskedruntime.service
index 669548a..db50f6e 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/maskedruntime.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/maskedruntime.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Masked Runtime Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Masked Runtime Service Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/maskedruntimestatic.service
b/test/test-enabled-root/usr/lib/systemd/system/maskedruntimestatic.service
index 0fcfc12..d2a95d2 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/maskedruntimestatic.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/maskedruntimestatic.service
@@ -1,9 +1,6 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Masked Runtime Static Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Masked Runtime Static Service Start"
diff --git a/test/test-enabled-root/usr/lib/systemd/system/maskedstatic.service
b/test/test-enabled-root/usr/lib/systemd/system/maskedstatic.service
index 0fcfc12..dd2ff1e 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/maskedstatic.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/maskedstatic.service
@@ -1,9 +1,6 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Masked Static Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Masked Static Service Start"
diff --git a/test/test-enabled-root/usr/lib/systemd/system/runtime.service
b/test/test-enabled-root/usr/lib/systemd/system/runtime.service
index 5fcdd66..0b24bd0 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/runtime.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/runtime.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Runtime Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Runtime Service Start"
[Install]
WantedBy=other.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/static.service
b/test/test-enabled-root/usr/lib/systemd/system/static.service
index 0fcfc12..a5f6c11 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/static.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/static.service
@@ -1,9 +1,6 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Static Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Static Service Start"
diff --git a/test/test-enabled-root/usr/lib/systemd/system/templating at .service
b/test/test-enabled-root/usr/lib/systemd/system/templating at .service
index 669548a..57a8c9d 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/templating at .service
+++ b/test/test-enabled-root/usr/lib/systemd/system/templating at .service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Templating Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Templating Service Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/templating at three.service
b/test/test-enabled-root/usr/lib/systemd/system/templating at three.service
index 669548a..d2b2d6c 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/templating at three.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/templating at three.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Templating Three Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Templating Three Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/templating at two.service
b/test/test-enabled-root/usr/lib/systemd/system/templating at two.service
index 669548a..3517229 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/templating at two.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/templating at two.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Templating Two
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Templating Two Start"
[Install]
WantedBy=some.target
diff --git a/test/test-enabled-root/usr/lib/systemd/system/unique.service
b/test/test-enabled-root/usr/lib/systemd/system/unique.service
index 669548a..efd176f 100644
--- a/test/test-enabled-root/usr/lib/systemd/system/unique.service
+++ b/test/test-enabled-root/usr/lib/systemd/system/unique.service
@@ -1,12 +1,9 @@
[Unit]
-Description=Crash recovery kernel arming
-After=network.target network-online.target remote-fs.target
+Description=Unique Service
[Service]
Type=oneshot
-ExecStart=/usr/bin/kdumpctl start
-ExecStop=/usr/bin/kdumpctl stop
-RemainAfterExit=yes
+ExecStart=/bin/echo "Unique Service Start"
[Install]
WantedBy=some.target
--
1.9.3
More information about the systemd-devel
mailing list