diff options
| author | Simon Rettberg | 2014-01-30 02:11:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-30 02:11:41 +0100 |
| commit | 7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b (patch) | |
| tree | fb99fb706a10c450a8c29c3c76afb00037b3508b | |
| parent | Some more blacklisting for stage 4 (diff) | |
| download | tm-scripts-7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b.tar.gz tm-scripts-7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b.tar.xz tm-scripts-7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b.zip | |
[systemd] Clean up build file
| -rw-r--r-- | remote/modules/systemd/systemd.build | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 7f2f0eb6..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" + 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 - # TODO: is this still needed? - 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/" |