diff options
| author | Dirk | 2014-02-21 11:16:02 +0100 |
|---|---|---|
| committer | Dirk | 2014-02-21 11:16:02 +0100 |
| commit | 1e30627c5b00884054fae7210d036e34ebe4f181 (patch) | |
| tree | 6d258c5a7a2279881706f38e37921dc4557a0b8d /remote/modules/systemd/systemd.build | |
| parent | Setzen des Windows-Namens beim Booten aus Laufwerk B: (diff) | |
| parent | [nvidia_libs] Debug: Checkin für Joey:). (diff) | |
| download | tm-scripts-1e30627c5b00884054fae7210d036e34ebe4f181.tar.gz tm-scripts-1e30627c5b00884054fae7210d036e34ebe4f181.tar.xz tm-scripts-1e30627c5b00884054fae7210d036e34ebe4f181.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
...
Diffstat (limited to 'remote/modules/systemd/systemd.build')
| -rw-r--r-- | remote/modules/systemd/systemd.build | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 8ccb3cca..95576548 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -53,33 +53,15 @@ build () { export LDFLAGS="$OLDLDFLAGS" export CPPFLAGS="$OLDCPPFLAGS" export PKG_CONFIG_PATH="$OLDPKG_CONFIG_PATH" - LD_LIBRARY_PATH="$OLDLD_LIBRARY_PATH" - - # Delete unneeded services - pinfo "Deleting unneeded services" - local SERVICE= - local OTHER= - for SERVICE in $REQUIRED_DISABLED_SERVICES; do - find "${MODULE_BUILD_DIR}" -name "$SERVICE" -exec rm -r {} \; - for OTHER in $(grep -l -r "$SERVICE" "$MODULE_BUILD_DIR/usr/lib/systemd/system"); do - sed -i -r "s#\s*$SERVICE\s*# #g" "$OTHER" - done - done + export LD_LIBRARY_PATH="$OLDLD_LIBRARY_PATH" } post_copy() { - # dont clear systemd log at startup - sed -i "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" - #old agetty version doesn't support --noclear option in getty service - if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; - then - sed -i.bak "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" + 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 - # add nfs to modules-load list - echo "nfs" > "${TARGET_BUILD_DIR}/etc/modules-load.d/nfs.conf" - # add pam_systemd.so to pam modules directory if [ -e "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" ]; then cp "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" "${TARGET_BUILD_DIR}/lib/security/" |