From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH] inetd services: don't use busybox's find in postinst
Date: Mon, 17 Jun 2019 16:06:46 +0200 [thread overview]
Message-ID: <20190617140646.9707-1-rhi@pengutronix.de> (raw)
busybox's find doesn't understand '-empty', so when running these
postinst scripts on a system without GNU coreutils, they will display a
nice help text instead.
Replace the find call with a test that tries to expand the same pattern
that is used afterwards, so cat doesn't run with a non-matching pattern.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/busybox.postinst | 3 +--
rules/dnsmasq.postinst | 3 +--
rules/inetutils.postinst | 3 +--
rules/portmap.postinst | 3 +--
rules/pureftpd.postinst | 3 +--
rules/rsync.postinst | 3 +--
rules/urshd.postinst | 3 +--
7 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/rules/busybox.postinst b/rules/busybox.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/busybox.postinst
+++ b/rules/busybox.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
diff --git a/rules/dnsmasq.postinst b/rules/dnsmasq.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/dnsmasq.postinst
+++ b/rules/dnsmasq.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
diff --git a/rules/inetutils.postinst b/rules/inetutils.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/inetutils.postinst
+++ b/rules/inetutils.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
diff --git a/rules/portmap.postinst b/rules/portmap.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/portmap.postinst
+++ b/rules/portmap.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
diff --git a/rules/pureftpd.postinst b/rules/pureftpd.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/pureftpd.postinst
+++ b/rules/pureftpd.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
diff --git a/rules/rsync.postinst b/rules/rsync.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/rsync.postinst
+++ b/rules/rsync.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
diff --git a/rules/urshd.postinst b/rules/urshd.postinst
index 6f564791d0c8..aa56d329fd72 100644
--- a/rules/urshd.postinst
+++ b/rules/urshd.postinst
@@ -1,8 +1,7 @@
#!/bin/sh
# generate inetd.conf
-if [ -d $DESTDIR/etc/inetd.conf.d ] &&
- [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then
+if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" ]; then
cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf
fi
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2019-06-17 14:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 14:06 Roland Hieber [this message]
2019-06-17 18:04 ` Alexander Dahl
2019-06-18 9:08 ` Roland Hieber
2019-06-18 9:21 ` Roland Hieber
2019-06-18 10:52 ` [ptxdist] [PATCH v2] " Roland Hieber
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=20190617140646.9707-1-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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