blob: 9abdaaef5c0a2255793e6776e959d94e7d11d27e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
diff --git a/arch-nspawn.in b/arch-nspawn.in
index cde1f60..03dc29c 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -23,8 +23,8 @@ files=()
mount_args=()
usage() {
- echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
- echo "A wrapper around systemd-nspawn. Provides support for pacman."
+ echo "Usage: ${0##*/} [options] working-dir [chroot-nspawn arguments]"
+ echo "A wrapper around chroot-nspawn. Provides support for pacman."
echo
echo ' options:'
echo ' -C <file> Location of a pacman config file'
@@ -124,10 +124,13 @@ fi
copy_hostconf
eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
+case "$CARCH" in
+ armv7h) CARCH=armv7l;;
+esac
[[ -z $nosetarch ]] || unset CARCH
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+exec ${CARCH:+setarch "$CARCH"} chroot-nspawn -q \
-D "$working_dir" \
-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
--register=no --keep-unit --as-pid2 \
diff --git a/mkarchroot.in b/mkarchroot.in
index 37f6802..d5dc9c7 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -97,7 +97,7 @@ printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
-systemd-machine-id-setup --root="$working_dir"
+dbus-uuidgen --ensure="$working_dir/etc/machine-id"
exec arch-nspawn \
"${nspawn_args[@]}" \
|
