From: Lucas De Marchi <lucas.de.marchi@gmail.com>
To: Josh Triplett <josh@joshtriplett.org>
Cc: linux-modules <linux-modules@vger.kernel.org>,
810367@bugs.debian.org, kmod@packages.debian.org
Subject: Re: [PATCH] depmod: Don't insert comment in modules.devname if otherwise empty
Date: Mon, 11 Jan 2016 10:43:56 -0200 [thread overview]
Message-ID: <CAKi4VAJJJ+nDene80fmzzm4WN_2=VLXrq7qc-urNYToQew+LgQ@mail.gmail.com> (raw)
In-Reply-To: <20160110151023.GA9659@x>
On Sun, Jan 10, 2016 at 1:10 PM, Josh Triplett <josh@joshtriplett.org> wrote:
> This allows tools to detect the file as empty, such as via systemd's
> ConditionFileNotEmpty.
> ---
>
> The string constant extends past 80 columns, per CODING-STYLE.
>
> The motivation for this patch came from Debian bug 810367. This change
> would allow kmod-static-nodes.service to use ConditionFileNotEmpty
> instead of ConditionPathExists.
>
> tools/depmod.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tools/depmod.c b/tools/depmod.c
> index a585d47..6e9bb4d 100644
> --- a/tools/depmod.c
> +++ b/tools/depmod.c
> @@ -1999,8 +1999,7 @@ static int output_builtin_bin(struct depmod *depmod, FILE *out)
> static int output_devname(struct depmod *depmod, FILE *out)
> {
> size_t i;
> -
> - fputs("# Device nodes to trigger on-demand module loading.\n", out);
> + bool empty = true;
>
> for (i = 0; i < depmod->modules.count; i++) {
> const struct mod *mod = depmod->modules.array[i];
> @@ -2036,10 +2035,15 @@ static int output_devname(struct depmod *depmod, FILE *out)
> }
>
> if (devname != NULL) {
> - if (type != '\0')
> + if (type != '\0') {
> + if (empty) {
> + fputs("# Device nodes to trigger on-demand module loading.\n",
> + out);
> + empty = false;
> + }
> fprintf(out, "%s %s %c%u:%u\n", mod->modname,
> devname, type, major, minor);
> - else
> + } else
> ERR("Module '%s' has devname (%s) but "
> "lacks major and minor information. "
> "Ignoring.\n", mod->modname, devname);
> --
Applied, thanks.
Lucas De Marchi
next prev parent reply other threads:[~2016-01-11 12:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-10 15:10 [PATCH] depmod: Don't insert comment in modules.devname if otherwise empty Josh Triplett
2016-01-11 12:43 ` Lucas De Marchi [this message]
2016-01-11 15:55 ` Bug#810367: " Martin Pitt
2016-01-11 16:06 ` Lucas De Marchi
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='CAKi4VAJJJ+nDene80fmzzm4WN_2=VLXrq7qc-urNYToQew+LgQ@mail.gmail.com' \
--to=lucas.de.marchi@gmail.com \
--cc=810367@bugs.debian.org \
--cc=josh@joshtriplett.org \
--cc=kmod@packages.debian.org \
--cc=linux-modules@vger.kernel.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).