diff options
author | Jonathan Bauer | 2013-05-23 20:30:14 +0200 |
---|---|---|
committer | Jonathan Bauer | 2013-05-23 20:30:14 +0200 |
commit | b6f1ac706cd0c3a58996074380dec31006d93185 (patch) | |
tree | 83f5b7e7f112a2a2d27cb53b1d35ed7851bda0b2 | |
parent | fix nss-ldap-sed-expr (diff) | |
download | tm-scripts-b6f1ac706cd0c3a58996074380dec31006d93185.tar.gz tm-scripts-b6f1ac706cd0c3a58996074380dec31006d93185.tar.xz tm-scripts-b6f1ac706cd0c3a58996074380dec31006d93185.zip |
...
-rw-r--r-- | helper/kernel.inc | 2 | ||||
-rwxr-xr-x | mltk | 9 | ||||
-rw-r--r-- | remote/modules/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" @@ -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 |