From d8fb4dd0bcb57a32f3b248798dc908992113672f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 2 Apr 2014 10:45:37 +0200 Subject: Fix Wait for collectd, minor fixes --- filehooker/packages.both | 3 +++ filehooker/refresh.sh | 4 ++-- .../etc/systemd/system/Reaktor@reaktor.service.d/wait.service | 2 -- filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf | 2 ++ .../root-image/etc/systemd/system/collectd.service.d/wait.service | 2 -- 5 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 filehooker/root-image/etc/systemd/system/Reaktor@reaktor.service.d/wait.service create mode 100644 filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf delete mode 100644 filehooker/root-image/etc/systemd/system/collectd.service.d/wait.service diff --git a/filehooker/packages.both b/filehooker/packages.both index 03bcc123..409abe91 100644 --- a/filehooker/packages.both +++ b/filehooker/packages.both @@ -1,6 +1,9 @@ arch-install-scripts python +hddtemp mlocate +collectd +sysstat vsftpd btrfs-progs lftp diff --git a/filehooker/refresh.sh b/filehooker/refresh.sh index 956edfc2..5400b2a4 100755 --- a/filehooker/refresh.sh +++ b/filehooker/refresh.sh @@ -1,6 +1,6 @@ #!/bin/sh - +set -eu cd "$(dirname "$(readlink -f "$0")")" rm -rvf out/ work -./build.sh -N filehooker +./build.sh -N filehooker -v cp -v out/filehooker* /home/makefu/isos diff --git a/filehooker/root-image/etc/systemd/system/Reaktor@reaktor.service.d/wait.service b/filehooker/root-image/etc/systemd/system/Reaktor@reaktor.service.d/wait.service deleted file mode 100644 index 45a9b4c8..00000000 --- a/filehooker/root-image/etc/systemd/system/Reaktor@reaktor.service.d/wait.service +++ /dev/null @@ -1,2 +0,0 @@ -[service] -ExecStartPre=/usr/bin/sleep 20 diff --git a/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf b/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf new file mode 100644 index 00000000..05d8b43c --- /dev/null +++ b/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.conf @@ -0,0 +1,2 @@ +[Service] +ExecStartPre=/usr/bin/sleep 20 diff --git a/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.service b/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.service deleted file mode 100644 index 45a9b4c8..00000000 --- a/filehooker/root-image/etc/systemd/system/collectd.service.d/wait.service +++ /dev/null @@ -1,2 +0,0 @@ -[service] -ExecStartPre=/usr/bin/sleep 20 -- cgit v1.2.3