diff options
| author | Christian Rößler | 2015-03-23 15:38:10 +0100 |
|---|---|---|
| committer | Christian Rößler | 2015-03-23 15:38:10 +0100 |
| commit | dc7fd2a83b9f9f92bffc15d74d770cb215ca4db7 (patch) | |
| tree | 6e59666c4c3f12c7906b7331e5c5863290e7e3ae | |
| parent | Fix last commit (diff) | |
| download | tm-scripts-dc7fd2a83b9f9f92bffc15d74d770cb215ca4db7.tar.gz tm-scripts-dc7fd2a83b9f9f92bffc15d74d770cb215ca4db7.tar.xz tm-scripts-dc7fd2a83b9f9f92bffc15d74d770cb215ca4db7.zip | |
[systemd, sssd] Patches for openSuse 13.2
| -rw-r--r-- | remote/modules/sssd/module.build | 6 | ||||
| -rw-r--r-- | remote/modules/systemd/module.build | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/remote/modules/sssd/module.build b/remote/modules/sssd/module.build index c6070455..041fd5bd 100644 --- a/remote/modules/sssd/module.build +++ b/remote/modules/sssd/module.build @@ -16,6 +16,12 @@ build() { mkdir -p "${MODULE_BUILD_DIR}/etc/systemd/system" sed "s,%PATH%,${SSSD_PATH},g" "${MODULE_DIR}/templates/sssd-systemd.service" > "${MODULE_BUILD_DIR}/etc/systemd/system/sssd.service" || perror "Could not fill sssd.service template" + # openSuse sssd does not start when /etc/sssd/sssd.conf is not root:root 600! + if [ "$SYS_DISTRIBUTION" == "opensuse" -a "$SYS_VERSION" == "13.2" ]; then + sed -i 's#ExecStart#ExecStartPre=/opt/openslx/bin/chmod 600 /etc/sssd/sssd.conf\nExecStart#g' \ + "${MODULE_BUILD_DIR}/etc/systemd/system/sssd.service" + fi + return 0 } diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build index 6e1cf4c1..67e019af 100644 --- a/remote/modules/systemd/module.build +++ b/remote/modules/systemd/module.build @@ -99,5 +99,9 @@ post_copy() { if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; then sed -i "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" fi + # eg. systemd expects /bin/less: + if [ "$SYS_DISTRIBUTION" == "opensuse" -a "$SYS_VERSION" == "13.2" ]; then + ln -s /usr/bin/less "$TARGET_BUILD_DIR/bin/less" + fi } |