diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-11 00:55:00 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-11 00:55:00 -0400 |
| commit | 66f612510a5df14f4a017809e1eec671aee8cc26 (patch) | |
| tree | 03da7982b84b01956f1ba45d120cccb50827bd53 | |
| parent | 4fcf9f8582cc78699b64884b872fe2578464c660 (diff) | |
Add changes discussed with Dave Reisner on the arch-projects list.libretools-20140511
- Simplify the commented out call to find HOST_NAME_MAX
- Use `systemd-nspawn -q` instead of 2>/dev/null
- Use Bash 4.1's new {var}>&- syntax in lock_close()
| -rw-r--r-- | arch-nspawn.in | 4 | ||||
| -rw-r--r-- | lib/common.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index ca7edbe..e8b68cf 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -96,14 +96,14 @@ eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") machine_name="${working_dir//[![:alnum:]_-]/-}" machine_name="${machine_name#-}" -#HOST_NAME_MAX="$(printf '%s\n' '#include <limits.h>' 'HOST_NAME_MAX'|cpp -|sed -n '$p')" +#HOST_NAME_MAX="$(cpp -include limits.h <<<HOST_NAME_MAX | sed -n '$p')" HOST_NAME_MAX=64 if [[ ${#machine_name} -gt "$HOST_NAME_MAX" ]]; then machine_name="${machine_name:(-${HOST_NAME_MAX})}" machine_name="${machine_name#-}" fi -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn 2>/dev/null \ +exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ -D "$working_dir" \ --machine "$machine_name" \ "${mount_args[@]}" \ diff --git a/lib/common.sh b/lib/common.sh index 44d12c3..6305528 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -183,7 +183,7 @@ slock() { ## lock_close() { local fd=$1 - eval "exec $fd>&-" + exec {fd}>&- } ## |