[slx-issue] externalize /etc/issue generation

5 files changed, 0 insertions, 115 deletions

diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service
deleted file mode 120000
index 4540789e..00000000
--- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/update-etc_issue.service
+++ /dev/null
@@ -1 +0,0 @@
-../update-etc_issue.service
\ No newline at end of file
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
deleted file mode 100644
index bdfab085..00000000
--- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Update /etc/issue
-After=setup-partitions.service
-Before=getty.target shutdown.target
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/opt/openslx/scripts/openslx-create_issue
-RemainAfterExit=no
diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/openslx-create_issue b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/openslx-create_issue
deleted file mode 100755
index c70e0356..00000000
--- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/openslx-create_issue
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-# Needs bash for string manipulation
-# Copyright (c) 2013, 2014 - bwLehrpool Projekt
-# Copyright (c) 2012 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org
-#
-# First script for initial ramfs for OpenSLX linux stateless clients
-#############################################################################
-
-# Set greeting and add information about the booted system
-
-declare -rg INFILE=/opt/openslx/etc/issue.template
-declare -rg TMPFILE=$(mktemp)
-declare -rg OUTFILE=/etc/issue
-
-. /opt/openslx/config
-
-# Replace known variables and determine maximum line length
-MAX=0
-while IFS='' read -r line || [ -n "$line" ]; do
-	line="${line//"%ip%"/"$SLX_PXE_CLIENT_IP"}"
-	line="${line//"%hostname%"/"$SLX_HOSTNAME"}"
-	tst="${line//"%space%"/}"
-	len=${#tst}
-	[ "$len" -gt "$MAX" ] && MAX=$len
-	echo "$line"
-done < "$INFILE" > "$TMPFILE"
-player=$(< /etc/vmware/config grep -m1 '^product.version' | awk -F= '{print $2}')
-kernel=$(uname -r)
-system="$(dmidecode -s system-manufacturer | grep -vP "unknown|filled|^#") $(dmidecode -s system-product-name | grep -vP "unknown|filled|^#")"
-linkspeed=$(cat /sys/class/net/eth0/speed)
-tmpstatus=$(grep -m1 ' /tmp ' /proc/mounts | awk '{print $3}')
-if [ -z "$tmpstatus" ] || [ "$tmpstatus" = "tmpfs" ]; then
-	tmpstatus="RAMDISK"
-else
-	tmpstatus="HDD"
-fi
-tmpstatus="$(df -P | grep -m1 ' /tmp$' | awk '{printf "%.1f", $2 / 1024 / 1024}')GiB ($tmpstatus)"
-
-cat >> "$TMPFILE" <<EOF
-System model: %space% $system
-Kernel version: %space% $kernel
-Temporary directory: %space% $tmpstatus
-Boot server: %space% $SLX_PXE_SERVER_IP
-EOF
-if [ -n "$linkspeed" ]; then
-	echo "Link speed: %space% ${linkspeed}MBit" >> "$TMPFILE"
-fi
-if [ -n "$SLX_SHUTDOWN_SCHEDULE" ]; then
-	echo "Scheduled shutdown: %space% $SLX_SHUTDOWN_SCHEDULE" >> "$TMPFILE"
-fi
-if [ -n "$SLX_REBOOT_SCHEDULE" ]; then
-	echo "Scheduled reboot: %space% $SLX_REBOOT_SCHEDULE" >> "$TMPFILE"
-fi
-if [ -n "$player" ]; then
-	echo "VMware version: %space% ${player//'"'/}" >> "$TMPFILE"
-fi
-
-echo "" >> "$TMPFILE"
-
-# Fix up spacing for right-aligned text
-while IFS='' read -r line || [ -n "$line" ]; do
-	tst=${line/"%space%"/}
-	if [ "$(( ${#line} - ${#tst} ))" -eq 7 ]; then
-		space=
-		while true; do
-			tst=${line/"%space%"/"$space"}
-			if [ "${#tst}" -ge "$MAX" ]; then
-				line="$tst"
-				break
-			fi
-			space=" $space"
-		done
-	fi
-	echo "$line"
-done < "$TMPFILE" > "$OUTFILE"
-
-rm -f -- "$TMPFILE"
-
-
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/rootfs/rootfs-stage32/templates/issue.template b/core/rootfs/rootfs-stage32/templates/issue.template
deleted file mode 100644
index a79797ad..00000000
--- a/core/rootfs/rootfs-stage32/templates/issue.template
+++ /dev/null
@@ -1,9 +0,0 @@
-   WELCOME TO %space% \n (\l)
-            _____  ______  ______ __    __    _______ __     __    __
-           /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
-          |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
-          |  | |  |   ___/|   _|      |   |   ____   |  |     |    |
-          |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
-            _____/|__|    |______|__|  |__|  |_______|______|__|  |__| - NG
-
-   %version%           (c) <OpenSLX.ORG>