mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] inetd services: don't use busybox's find in postinst
@ 2019-06-17 14:06 Roland Hieber
  2019-06-17 18:04 ` Alexander Dahl
  0 siblings, 1 reply; 5+ messages in thread
From: Roland Hieber @ 2019-06-17 14:06 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-06-18 10:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-17 14:06 [ptxdist] [PATCH] inetd services: don't use busybox's find in postinst Roland Hieber
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox