From ee84e2165c2eb0d49c59a3d6faa75b195229438c Mon Sep 17 00:00:00 2001
From: torben
Date: Thu, 24 Mar 2016 19:44:37 +0100
Subject: Fix example module.

---
 builder/dnbd3-rootfs/services/dnbd3-generator.sh | 30 ------------------------
 dev-tools/exampleDracutModule/apply-package.sh   |  3 +--
 dev-tools/exampleDracutModule/example.service    | 10 ++++++++
 dev-tools/exampleDracutModule/module-setup.sh    |  3 +++
 4 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 builder/dnbd3-rootfs/services/dnbd3-generator.sh
 create mode 100644 dev-tools/exampleDracutModule/example.service

diff --git a/builder/dnbd3-rootfs/services/dnbd3-generator.sh b/builder/dnbd3-rootfs/services/dnbd3-generator.sh
deleted file mode 100644
index bb9e7ad5..00000000
--- a/builder/dnbd3-rootfs/services/dnbd3-generator.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-GENERATOR_DIR="$2"
-[ -z "$GENERATOR_DIR" ] && exit 1
-[ -d "$GENERATOR_DIR" ] || mkdir "$GENERATOR_DIR"
-#GENERATOR_DIR="/run/systemd/generator/"
-{
-    echo "[Unit]"
-    echo "Description=root fs on dnbd3 (distributed network block device)"
-    echo "After=dracut-initqueue.service network.target"
-    echo "Before=dracut-mount.service"
-    echo "DefaultDependencies=no"
-    echo "IgnoreOnIsolate=true"
-    echo "#Conflicts=shutdown.target"
-    echo "#ConditionKernelCommandLine=!"
-    echo "#ConditionPathExists=/etc/multipath.conf"
-    echo ""
-    echo "[Service]"
-    echo "Type=oneshot"
-    echo "RemainAfterExit=true"
-    echo "KillMode=none"
-    echo "ExecStartPre=/sbin/fetch-config"
-    echo "ExecStart=/sbin/dnbd3root"
-    echo "#ExecReload=/sbin/multipathd reconfigure"
-    echo "#ExecStop=echo 'stopping dnbd3'"
-} > "$GENERATOR_DIR"/dnbd3root.service
-[ -d "$GENERATOR_DIR"/sysinit.target.wants ] || mkdir -p "$GENERATOR_DIR"/sysinit.target.wants
-ln -s ../dnbd3root.service "$GENERATOR_DIR"/sysinit.target.wants/dnbd3root.service
-[ -d "$GENERATOR_DIR"/remote-fs.target.wants ] || mkdir -p "$GENERATOR_DIR"/remote-fs.target.wants
-ln -s ../dnbd3root.service "$GENERATOR_DIR"/remote-fs.target.wants/dnbd3root.service
-exit 0
diff --git a/dev-tools/exampleDracutModule/apply-package.sh b/dev-tools/exampleDracutModule/apply-package.sh
index 67bcf665..07d3c0a5 100755
--- a/dev-tools/exampleDracutModule/apply-package.sh
+++ b/dev-tools/exampleDracutModule/apply-package.sh
@@ -17,7 +17,6 @@ exceptions.try
     exceptions.activate
 
     logging.info 'Getting package.'
-    mkdir --parents /tmp/slx_config
     IFS_backup="$IFS"
     IFS=','
     for host in ${slx_server}; do
@@ -25,7 +24,7 @@ exceptions.try
         if wget --timeout 5 \
             "http://${host}/${slx_server_base}config.tar.gz" \
             --output-document - | tar --extract --verbose --gzip --directory \
-                /tmp/slx_config
+                "$NEWROOT"
         then
             break
         fi
diff --git a/dev-tools/exampleDracutModule/example.service b/dev-tools/exampleDracutModule/example.service
new file mode 100644
index 00000000..83310c1d
--- /dev/null
+++ b/dev-tools/exampleDracutModule/example.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Simple example service
+After=dracut-pre-mount.service network.target
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+KillMode=none
+ExecStart=/usr/bin/bash -c '/usr/bin/echo test >/tmp/test-output.txt'
diff --git a/dev-tools/exampleDracutModule/module-setup.sh b/dev-tools/exampleDracutModule/module-setup.sh
index 1604fd3f..af9bda6c 100755
--- a/dev-tools/exampleDracutModule/module-setup.sh
+++ b/dev-tools/exampleDracutModule/module-setup.sh
@@ -14,6 +14,9 @@ check() {
 
     `check`
     '
+
+    # Here we could build our package file.
+
     # Tell dracut that this module should only be included if it is required
     # explicitly.
     return 255
-- 
cgit v1.2.3-55-g7522