From: Matthias Schiffer Date: Tue, 24 Jan 2017 17:55:13 +0000 (+0100) Subject: base-files: fix user creation on sysupgrade with few opkg control files X-Git-Tag: v17.01.0-rc1~13 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=a1f918cd92c4afcdd3a9caceba030f9eb435c265 base-files: fix user creation on sysupgrade with few opkg control files If only a single opkg control file exists (which can happen with CONFIG_CLEAN_IPKG), grep would not print the file name by default. Instead of forcing it using -H, we just switch to -l (print only file names) and get rid of the cut. Add -s to suppress an error message when no control files exist. Signed-off-by: Matthias Schiffer --- diff --git a/package/base-files/files/etc/uci-defaults/13_fix_group_user b/package/base-files/files/etc/uci-defaults/13_fix_group_user index deade5bbd1..e6dae2419f 100644 --- a/package/base-files/files/etc/uci-defaults/13_fix_group_user +++ b/package/base-files/files/etc/uci-defaults/13_fix_group_user @@ -2,7 +2,7 @@ . /lib/functions.sh -for file in `grep Require-User /usr/lib/opkg/info/*.control | cut -d: -f1`; do +for file in `grep -sl Require-User /usr/lib/opkg/info/*.control`; do file="${file##*/}" file="${file%.control}" add_group_and_user "${file}"