diff options
author | David P <megver83@parabola.nu> | 2018-08-20 23:21:21 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2018-08-20 23:35:45 -0300 |
commit | 4307c2b1cdb299cd12403f499cb3fde70781bd1e (patch) | |
tree | 0bd340aafb4ee4fe728c9e480ffef08ea96c2ffc /nonsystemd/libretools/Remove-systemd-support.patch | |
parent | b0798981ede6248dbe84b3b2422ef7051b146878 (diff) | |
download | abslibre-4307c2b1cdb299cd12403f499cb3fde70781bd1e.tar.gz abslibre-4307c2b1cdb299cd12403f499cb3fde70781bd1e.tar.bz2 abslibre-4307c2b1cdb299cd12403f499cb3fde70781bd1e.zip |
upgpkg: nonsystemd/libretools 20180815-1.nonsystemd1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'nonsystemd/libretools/Remove-systemd-support.patch')
-rw-r--r-- | nonsystemd/libretools/Remove-systemd-support.patch | 49 |
1 files changed, 13 insertions, 36 deletions
diff --git a/nonsystemd/libretools/Remove-systemd-support.patch b/nonsystemd/libretools/Remove-systemd-support.patch index 0e1eb0311..89090b171 100644 --- a/nonsystemd/libretools/Remove-systemd-support.patch +++ b/nonsystemd/libretools/Remove-systemd-support.patch @@ -1,6 +1,6 @@ -From 16e877ff4f66de4a24b614ea74adb9f35142f06f Mon Sep 17 00:00:00 2001 +From bd3b3ab9bf12ad1293cd2d5eaaa44c40545bfdc5 Mon Sep 17 00:00:00 2001 From: David P <megver83@parabola.nu> -Date: Sat, 12 May 2018 13:53:09 -0300 +Date: Mon, 20 Aug 2018 23:17:48 -0300 Subject: [PATCH] Remove systemd support Libretools uses systemd-nspawn and systemd-id-machine-setup @@ -10,17 +10,17 @@ with chroot-nspawn Signed-off-by: David P <megver83@parabola.nu> --- - INSTALL | 2 +- - src/chroot-tools/arch-nspawn.in | 6 +++--- - src/chroot-tools/librechroot | 18 +++++++++--------- - src/chroot-tools/mkarchroot.in | 2 -- - 4 files changed, 13 insertions(+), 15 deletions(-) + INSTALL | 2 +- + src/chroot-tools/arch-nspawn.in | 6 +++--- + src/chroot-tools/librechroot | 2 +- + src/chroot-tools/mkarchroot.in | 2 -- + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/INSTALL b/INSTALL -index e91f1ea..b8516ec 100644 +index a74a376..3623f07 100644 --- a/INSTALL +++ b/INSTALL -@@ -76,7 +76,7 @@ main libretools subpackage: +@@ -71,7 +71,7 @@ main libretools subpackage: - GNU Make (only needed for `librefetch`) - ssh client (OpenSSH, only needed for `librerelease`) - rsync @@ -30,7 +30,7 @@ index e91f1ea..b8516ec 100644 Configuration diff --git a/src/chroot-tools/arch-nspawn.in b/src/chroot-tools/arch-nspawn.in -index c448056..a90b90a 100644 +index 96b3e38..a7d7386 100644 --- a/src/chroot-tools/arch-nspawn.in +++ b/src/chroot-tools/arch-nspawn.in @@ -18,8 +18,8 @@ working_dir='' @@ -44,7 +44,7 @@ index c448056..a90b90a 100644 echo echo ' options:' echo ' -C <file> Location of a pacman config file' -@@ -115,7 +115,7 @@ esac +@@ -116,7 +116,7 @@ esac [[ -z $nosetarch ]] || unset CARCH @@ -54,7 +54,7 @@ index c448056..a90b90a 100644 -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 868741f..f81fbca 100755 +index 5d1db21..39dfc08 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -89,7 +89,7 @@ hack_arch_nspawn_flags() { @@ -66,29 +66,6 @@ index 868741f..f81fbca 100755 return $EXIT_NOTINSTALLED fi -@@ -405,14 +405,14 @@ main() { - umask 0022 - - # XXX: SYSTEMD-STDIN HACK -- if ! [[ -t 0 ]]; then -- error "Input is not a TTY" -- plain "https://labs.parabola.nu/issues/431" -- plain "https://bugs.freedesktop.org/show_bug.cgi?id=70290" -- prose "Due to a bug in systemd-nspawn, redirecting stdin is not -- supported." >&2 -- return $EXIT_FAILURE -- fi -+# if ! [[ -t 0 ]]; then -+# error "Input is not a TTY" -+# plain "https://labs.parabola.nu/issues/431" -+# plain "https://bugs.freedesktop.org/show_bug.cgi?id=70290" -+# prose "Due to a bug in systemd-nspawn, redirecting stdin is not -+# supported." >&2 -+# return $EXIT_FAILURE -+# fi - - # Keep this lock for as long as we are running - # Note that '9' is the same FD number as in mkarchroot et al. diff --git a/src/chroot-tools/mkarchroot.in b/src/chroot-tools/mkarchroot.in index 5165960..7ac9d1c 100644 --- a/src/chroot-tools/mkarchroot.in @@ -103,5 +80,5 @@ index 5165960..7ac9d1c 100644 ${nosetarch:+-s} \ ${pac_conf:+-C "$pac_conf"} \ -- -2.17.0 +2.18.0 |