From b6f1ac706cd0c3a58996074380dec31006d93185 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 23 May 2013 20:30:14 +0200
Subject: ...

---
 helper/kernel.inc                                                | 2 ++
 mltk                                                             | 9 ---------
 .../pam/data/etc/systemd/system/activate-nss-ldap.service        | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/helper/kernel.inc b/helper/kernel.inc
index 6901c4b4..3f6d57aa 100644
--- a/helper/kernel.inc
+++ b/helper/kernel.inc
@@ -20,6 +20,8 @@ if [ -z "${KERNEL_VERSION}" ]; then
 	[ -z "${KERNEL_VERSION}" ] && perror "KERNEL_VERSION still not set after sourcing, something is very wrong..."
 fi
 
+KERNEL_VERSION="3.2.0-40-generic"
+
 # set global KERNEL_TARGET_NAME
 KERNEL_TARGET_NAME="vmlinuz-${KERNEL_VERSION}-openslx"
 
diff --git a/mltk b/mltk
index 6b260000..83b17998 100755
--- a/mltk
+++ b/mltk
@@ -37,15 +37,6 @@ for HELPER in $ROOT_DIR/helper/*.inc; do
 	qnd_exit
 done
 
-# TODO: Configurable!
-#if [ "$(uname -p)" = "x86_64" ]; then
-#	KERNEL_VERSION="3.2.40"
-#	SELECTED_KERNEL="x86_64/$KERNEL_VERSION"
-#else
-#	KERNEL_VERSION="3.2.40"
-#	SELECTED_KERNEL="x86_32/$KERNEL_VERSION"
-#fi
-
 banner () {
 	echo -e "\033[38;5;202m\t           __   __   __    "
 	echo -e "\033[38;5;202m\t.--------.|  | |  |_|  |--."
diff --git a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
index 721c6adc..a09b78ae 100644
--- a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
+++ b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
@@ -3,4 +3,4 @@ Description=Activate NSS-LDAP lookups
 
 [Service]
 Type=simple
-ExecStart=/opt/openslx/bin/sed -i.bak 's/^passwd.*/passwd:\t\tfiles ldap/g;s/^group.*/group:\t\tfiles ldap/g' /etc/nsswitch.conf
+ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd.*/passwd:\t\tfiles ldap/g;s/^group.*/group:\t\tfiles ldap/g' /etc/nsswitch.conf
-- 
cgit v1.2.3-55-g7522