diff options
| author | Jonathan Bauer | 2014-01-29 18:32:56 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-29 18:32:56 +0100 |
| commit | a917692f2b2440eade996202a64e93ad98613d76 (patch) | |
| tree | 7ce547dee503a0709cc77d48687279f71407825c /remote/modules/systemd/systemd.build | |
| parent | also don't require stage_to_exclude anymore on command line (diff) | |
| download | tm-scripts-a917692f2b2440eade996202a64e93ad98613d76.tar.gz tm-scripts-a917692f2b2440eade996202a64e93ad98613d76.tar.xz tm-scripts-a917692f2b2440eade996202a64e93ad98613d76.zip | |
[systemd] reworked how we get the default systemd services files. We now
maintain our own minimalistic set of services instead of just filtering
out the "bad ones".
Diffstat (limited to 'remote/modules/systemd/systemd.build')
| -rw-r--r-- | remote/modules/systemd/systemd.build | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 8ccb3cca..7f2f0eb6 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -56,15 +56,15 @@ build () { 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 + #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 } post_copy() { @@ -72,12 +72,12 @@ post_copy() { 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 + 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" 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 |