Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] autofs: fix map locations in auto.master
Date: Mon, 20 Jan 2020 19:34:23 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18429@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages autofs
https://github.com/void-linux/void-packages/pull/18429

autofs: fix map locations in auto.master
The default auto.master looks for map files in /etc, but the package puts maps in /etc/autofs. This PR alters the default auto.master to look for maps in the right location.

A patch file from https://github.com/void-linux/void-packages/pull/18429.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autofs-18429.patch --]
[-- Type: text/x-diff, Size: 871 bytes --]

From 1f331c970352e655fbebcb2d30bb7aa4185d1341 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 20 Jan 2020 12:58:06 -0500
Subject: [PATCH] autofs: fix map locations in auto.master

---
 srcpkgs/autofs/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 67f298b2dc4..4b32d15507e 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.6
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
@@ -33,6 +33,8 @@ pre_configure() {
 
 pre_build() {
 	unset STRIP
+	# Fix path for map files
+	vsed -i "s@/etc/@/etc/autofs/@g" samples/auto.master
 }
 
 post_install() {

             reply	other threads:[~2020-01-20 18:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-20 18:34 voidlinux-github [this message]
2020-01-21 14:07 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-18429@inbox.vuxu.org \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).