summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-01-24 18:55:13 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2017-01-27 10:10:02 +0100
commita1f918cd92c4afcdd3a9caceba030f9eb435c265 (patch)
treec46401277e672dbc825db26739bff9482e6a964b
parent04a508512790017c768acf887cf0ac52daaba234 (diff)
downloadmtk-20170518-a1f918cd92c4afcdd3a9caceba030f9eb435c265.zip
mtk-20170518-a1f918cd92c4afcdd3a9caceba030f9eb435c265.tar.gz
mtk-20170518-a1f918cd92c4afcdd3a9caceba030f9eb435c265.tar.bz2
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 <mschiffer@universe-factory.net>
-rw-r--r--package/base-files/files/etc/uci-defaults/13_fix_group_user2
1 files changed, 1 insertions, 1 deletions
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 deade5b..e6dae24 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}"