summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 12:24:55 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 12:24:55 -0400
commitd0e593c9f8deef75e1d7878787f62e111303d9ba (patch)
tree29a5572db2336be21a109fe14954abd3e40861d9
parentf54791c247344f4077f1f25f933e62e7e45e3ab7 (diff)
parent71b15aafb64b8c8d032eab7d41e15c6e4f648c58 (diff)
Merge commit '71b1' into complete
Conflicts: mkarchroot.in
-rw-r--r--mkarchroot.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkarchroot.in b/mkarchroot.in
index bfdec39..ce732be 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -90,7 +90,7 @@ shift 1
if [[ $MODE == u ]]; then
MODE=r
- set -- /bin/sh -c 'pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)'
+ set -- pacman -Syu --noconfirm
fi
################################################################################
@@ -155,7 +155,7 @@ chroot_run() {
if [[ $NONETWORK = y ]]; then
nspawn_args+=(--private-network)
fi
- eval systemd-nspawn "${nspawn_args[@]}" -- "${@}" 2>/dev/null
+ systemd-nspawn "${nspawn_args[@]}" -- "${@}" 2>/dev/null
}
# }}}