summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJonathan Bauer2018-04-10 12:14:46 +0200
committerJonathan Bauer2018-04-10 12:14:46 +0200
commit2f598cf3a032592b81b6e2db1fe947577971a5b8 (patch)
tree5d59112e58885a708f1c909632abf5b81a0765ec /core
parentMerge branch 'master' of git.openslx.org:openslx-ng/mltk (diff)
downloadmltk-2f598cf3a032592b81b6e2db1fe947577971a5b8.tar.gz
mltk-2f598cf3a032592b81b6e2db1fe947577971a5b8.tar.xz
mltk-2f598cf3a032592b81b6e2db1fe947577971a5b8.zip
[slx-issue] externalize /etc/issue generation
Diffstat (limited to 'core')
l---------core/modules/slx-issue/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service (renamed from core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service)0
-rw-r--r--core/modules/slx-issue/data/etc/systemd/system/update-etc_issue.service (renamed from core/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service)0
-rwxr-xr-xcore/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue (renamed from core/rootfs/rootfs-stage32/data/opt/openslx/scripts/openslx-create_issue)0
-rw-r--r--core/modules/slx-issue/module.build20
-rw-r--r--core/modules/slx-issue/module.conf1
-rw-r--r--core/modules/slx-issue/templates/issue.template (renamed from core/rootfs/rootfs-stage32/templates/issue.template)0
-rw-r--r--core/rootfs/rootfs-stage32/module.build8
l---------core/targets/stage32-bwlp/slx-issue1
8 files changed, 22 insertions, 8 deletions
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service b/core/modules/slx-issue/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service
index 4540789e..4540789e 120000
--- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service
+++ b/core/modules/slx-issue/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service b/core/modules/slx-issue/data/etc/systemd/system/update-etc_issue.service
index bdfab085..bdfab085 100644
--- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
+++ b/core/modules/slx-issue/data/etc/systemd/system/update-etc_issue.service
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/openslx-create_issue b/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue
index c70e0356..c70e0356 100755
--- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/openslx-create_issue
+++ b/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue
diff --git a/core/modules/slx-issue/module.build b/core/modules/slx-issue/module.build
new file mode 100644
index 00000000..f9ee3f20
--- /dev/null
+++ b/core/modules/slx-issue/module.build
@@ -0,0 +1,20 @@
+#!/bin/bash
+fetch_source() {
+ :
+}
+
+build() {
+ :
+}
+
+post_copy() {
+ # Create issue.template
+ local DIST=$(lsb_release -sd)
+ local GITC=$(git rev-parse --short HEAD)
+ local DATE=$(date "+%Y-%m-%d")
+ local VERSION=$(echo "bwLehrpool/$DIST $DATE/$GITC" | escape_replace)
+ mkdir -p "$TARGET_BUILD_DIR/opt/openslx/etc"
+ sed "s/%version%/$VERSION/g" "$MODULE_DIR/templates/issue.template" > "$TARGET_BUILD_DIR/opt/openslx/etc/issue.template" || perror "Could not create issue template"
+
+}
+
diff --git a/core/modules/slx-issue/module.conf b/core/modules/slx-issue/module.conf
new file mode 100644
index 00000000..c01ade29
--- /dev/null
+++ b/core/modules/slx-issue/module.conf
@@ -0,0 +1 @@
+# Nothing
diff --git a/core/rootfs/rootfs-stage32/templates/issue.template b/core/modules/slx-issue/templates/issue.template
index a79797ad..a79797ad 100644
--- a/core/rootfs/rootfs-stage32/templates/issue.template
+++ b/core/modules/slx-issue/templates/issue.template
diff --git a/core/rootfs/rootfs-stage32/module.build b/core/rootfs/rootfs-stage32/module.build
index fea32270..54200708 100644
--- a/core/rootfs/rootfs-stage32/module.build
+++ b/core/rootfs/rootfs-stage32/module.build
@@ -141,13 +141,5 @@ post_copy() {
pwarning "Could not determine distribution"
fi
fi
- # Create issue.template
- local DIST=$(lsb_release -sd)
- local GITC=$(git rev-parse --short HEAD)
- local DATE=$(date "+%Y-%m-%d")
- local VERSION=$(echo "bwLehrpool/$DIST $DATE/$GITC" | escape_replace)
- mkdir -p "$TARGET_BUILD_DIR/opt/openslx/etc"
- sed "s/%version%/$VERSION/g" "$MODULE_DIR/templates/issue.template" > "$TARGET_BUILD_DIR/opt/openslx/etc/issue.template" || perror "Could not create issue template"
-
}
diff --git a/core/targets/stage32-bwlp/slx-issue b/core/targets/stage32-bwlp/slx-issue
new file mode 120000
index 00000000..83768536
--- /dev/null
+++ b/core/targets/stage32-bwlp/slx-issue
@@ -0,0 +1 @@
+../../modules/slx-issue \ No newline at end of file