about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2016-01-21T18·32+0100
committerVincent Ambo <tazjin@gmail.com>2016-01-21T18·32+0100
commit1eb2797d03d985513a00f6f5020f52b08c6cc2f2 (patch)
treec8a15a3c92a956615a551d08aea32eeb54b23f6c
parentd2e97f40421d3f886429ab612d5de178700c40b0 (diff)
Update demo units, change font size
-rw-r--r--demo/demo-error.service (renamed from demo/demo-error@.service)0
-rw-r--r--demo/demo-limits.slice1
-rw-r--r--demo/demo-path.path6
-rw-r--r--demo/demo-stress.service6
-rw-r--r--demo/demo-timer.service6
-rw-r--r--demo/demo-timer.timer2
-rw-r--r--demo/demo.service6
-rw-r--r--slides.pdfpc2
-rw-r--r--slides.tex2
9 files changed, 21 insertions, 10 deletions
diff --git a/demo/demo-error@.service b/demo/demo-error.service
index b2d4c9d34799..b2d4c9d34799 100644
--- a/demo/demo-error@.service
+++ b/demo/demo-error.service
diff --git a/demo/demo-limits.slice b/demo/demo-limits.slice
index 583db59badcd..998185d26177 100644
--- a/demo/demo-limits.slice
+++ b/demo/demo-limits.slice
@@ -5,4 +5,3 @@ Before=slices.target
 
 [Slice]
 CPUQuota=10%
-MemoryLimit=1G
diff --git a/demo/demo-path.path b/demo/demo-path.path
new file mode 100644
index 000000000000..87f1342da995
--- /dev/null
+++ b/demo/demo-path.path
@@ -0,0 +1,6 @@
+[Unit]
+Description=Demonstrate systemd path units
+
+[Path]
+DirectoryNotEmpty=/tmp/hackeriet
+Unit=demo.service
diff --git a/demo/demo-stress.service b/demo/demo-stress.service
new file mode 100644
index 000000000000..7e14f13e29d9
--- /dev/null
+++ b/demo/demo-stress.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Stress test CPU
+
+[Service]
+Slice=demo.slice
+ExecStart=/usr/bin/stress -c 5
diff --git a/demo/demo-timer.service b/demo/demo-timer.service
deleted file mode 100644
index 2f6a20e14754..000000000000
--- a/demo/demo-timer.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Demo unit for systemd timers
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/echo "Systemd timer fired! Hello Hackeriet."
diff --git a/demo/demo-timer.timer b/demo/demo-timer.timer
index ab5ec5135ab4..34eccb98b02a 100644
--- a/demo/demo-timer.timer
+++ b/demo/demo-timer.timer
@@ -5,7 +5,7 @@ Description=Demonstrate systemd timers
 OnActiveSec=2
 OnUnitActiveSec=5
 AccuracySec=5
-
+Unit=demo.service
 # OnCalendar=Thu,Fri 2016-*-1,5 11:12:13
 
 [Install]
diff --git a/demo/demo.service b/demo/demo.service
new file mode 100644
index 000000000000..fcc710ad933f
--- /dev/null
+++ b/demo/demo.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Demo unit for systemd
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/echo "Systemd unit activated. Hello Hackeriet."
diff --git a/slides.pdfpc b/slides.pdfpc
index 35fa8309e1ae..99326bd8bf4e 100644
--- a/slides.pdfpc
+++ b/slides.pdfpc
@@ -82,4 +82,4 @@ Another thing is that services start depending on systemd when they shouldn't, a
 Despite criticism, systemd was adopted rapidly by large portions of the Linux
 Initially in RedHat, because Poettering and co work there and it was clear from the beginning that it would be there
 ArchLinux (which I'm using) and a few others followed suit quite quickly
-Eventually, the big Debian init system discussion - after a lot of flaming - led to Debian adopting it as well, which had a ripple effect for related distros such as Ubuntu which abandoned upstart for it.
+Eventually, the big Debian init system discussion - after a lot of flaming - led to Debian adopting it as well, which had a ripple effect for related distros such as Ubuntu which abandoned upstart for it.
\ No newline at end of file
diff --git a/slides.tex b/slides.tex
index 51706e59902d..de5a7bf80596 100644
--- a/slides.tex
+++ b/slides.tex
@@ -1,4 +1,4 @@
-\documentclass[14pt]{beamer}
+\documentclass[12pt]{beamer}
 \usetheme{metropolis}
 
 \newenvironment{code}{\ttfamily}{\par}