From 6a7dcdeff9dee3c3b1192e61ad8e5a58f2215db0 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 13 Sep 2017 00:08:30 +0200
Subject: arch-nspawn: Hack to give the inner process a controlling terminal

This was lost at some point.
---
 arch-nspawn.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch-nspawn.in b/arch-nspawn.in
index c55f498..d25fa3b 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -116,4 +116,4 @@ exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
 	--register=no --keep-unit --as-pid2 \
 	"${mount_args[@]}" \
-	"$@"
+	/bin/bash -c 'exec </dev/console -- "$@"' bash "${1:-/bin/bash}" "${@:2}"
-- 
cgit v1.2.3-54-g00ecf


From 6b55282bd702afd9a36409f85d9cb4c608ada5e5 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 13 Sep 2017 00:25:06 +0200
Subject: Revert "arch-nspawn: Hack to give the inner process a controlling
 terminal"

Whoops, this will of course mess with nspawn arguments passed to
arch-nspawn.
---
 arch-nspawn.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch-nspawn.in b/arch-nspawn.in
index d25fa3b..c55f498 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -116,4 +116,4 @@ exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
 	--register=no --keep-unit --as-pid2 \
 	"${mount_args[@]}" \
-	/bin/bash -c 'exec </dev/console -- "$@"' bash "${1:-/bin/bash}" "${@:2}"
+	"$@"
-- 
cgit v1.2.3-54-g00ecf