diff options
| author | David P <megver83@parabola.nu> | 2020-09-01 17:58:24 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2020-09-01 17:58:24 -0400 |
| commit | 3cc3e3d3a335d21590537664da783bc73faf1953 (patch) | |
| tree | 0fb04f5a8bd5d26a61125faedaa56c842f03d0d4 /nonsystemd/libretools/nonsystemd.patch | |
| parent | 37fe2cea979826a22b3144c041cdb9cc42edfb89 (diff) | |
| download | abslibre-3cc3e3d3a335d21590537664da783bc73faf1953.tar.gz abslibre-3cc3e3d3a335d21590537664da783bc73faf1953.tar.bz2 abslibre-3cc3e3d3a335d21590537664da783bc73faf1953.zip | |
updpkg: nonsystemd/libretools 20181004-6.1.nonsystemd2
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'nonsystemd/libretools/nonsystemd.patch')
| -rw-r--r-- | nonsystemd/libretools/nonsystemd.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/nonsystemd/libretools/nonsystemd.patch b/nonsystemd/libretools/nonsystemd.patch new file mode 100644 index 000000000..24fab7e5a --- /dev/null +++ b/nonsystemd/libretools/nonsystemd.patch @@ -0,0 +1,63 @@ +diff --git a/INSTALL b/INSTALL +index a74a376..3623f07 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -71,7 +71,7 @@ main libretools subpackage: + - GNU Make (only needed for `librefetch`) + - ssh client (OpenSSH, only needed for `librerelease`) + - rsync +- - systemd-nspawn (for the chroot tools) ++ - chroot-nspawn (for the chroot tools) + - tokyocabinet + + Configuration +diff --git a/src/chroot-tools/arch-nspawn.in b/src/chroot-tools/arch-nspawn.in +index 96b3e38..a7d7386 100644 +--- a/src/chroot-tools/arch-nspawn.in ++++ b/src/chroot-tools/arch-nspawn.in +@@ -18,8 +18,8 @@ working_dir='' + files=() + + 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' +@@ -116,7 +116,7 @@ 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/src/chroot-tools/librechroot b/src/chroot-tools/librechroot +index b3cf041..5c3f8f2 100755 +--- a/src/chroot-tools/librechroot ++++ b/src/chroot-tools/librechroot +@@ -89,7 +89,7 @@ hack_arch_nspawn_flags() { + prose 'Such a binfmt_misc entry is provided by the %s + package. If you have it installed, but still see + this message, you may need to restart %s.' \ +- qemu-user-static-binfmt systemd-binfmt.service ++ qemu-user-static-binfmt binfmt + return $EXIT_NOTINSTALLED + fi + +diff --git a/src/chroot-tools/mkarchroot.in b/src/chroot-tools/mkarchroot.in +index 5165960..f6c6cfa 100644 +--- a/src/chroot-tools/mkarchroot.in ++++ b/src/chroot-tools/mkarchroot.in +@@ -90,7 +90,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 "$(librelib chroot/arch-nspawn)" \ + ${nosetarch:+-s} \ |