diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-09-11 13:58:11 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-09-11 13:58:11 -0400 |
| commit | 6fbdc4eb481302541cf8fa282fb3453e4c5d0d16 (patch) | |
| tree | e621d9e13629f628b6101908e84bca60c1b49f63 /arch-nspawn.in | |
| parent | 3aca3b64077cfdb5132c08958c5e0e873aca89d2 (diff) | |
arch-nspawn: set machine_name in a safer/different way, don't hide errorslibretools-20130914
Diffstat (limited to 'arch-nspawn.in')
| -rw-r--r-- | arch-nspawn.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 66a0f37..ec9b2d3 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -98,10 +98,10 @@ copy_hostconf eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") -machine_name="${working_dir//\//-}" -machine_name="${machine_name#-}" +machine_name="${working_dir##*/}" +machine_name="${machine_name//\./-}" -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn 2>/dev/null \ +exec ${CARCH:+setarch "$CARCH"} systemd-nspawn \ -D "$working_dir" \ --machine "$machine_name" \ "${mount_args[@]}" \ |