[OpenWrt-Devel] [PATCH] base-files: remove shebang from uci-defaults files
Adrian Schmutzler
freifunk at adrianschmutzler.de
Fri Nov 8 06:50:31 EST 2019
uci-defaults are sourced and non-executable, so they do not require
a shebang.
While at it, apply consistent naming scheme.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
package/base-files/files/etc/uci-defaults/10_migrate-shadow | 2 --
.../base-files/files/etc/uci-defaults/12_network-generate-ula | 2 --
.../etc/uci-defaults/{13_fix_group_user => 13_fix-group-user} | 2 --
3 files changed, 6 deletions(-)
rename package/base-files/files/etc/uci-defaults/{13_fix_group_user => 13_fix-group-user} (94%)
diff --git a/package/base-files/files/etc/uci-defaults/10_migrate-shadow b/package/base-files/files/etc/uci-defaults/10_migrate-shadow
index a354844fe4..481444f35e 100644
--- a/package/base-files/files/etc/uci-defaults/10_migrate-shadow
+++ b/package/base-files/files/etc/uci-defaults/10_migrate-shadow
@@ -1,5 +1,3 @@
-#!/bin/sh
-
ppwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/passwd)"
spwd="$(sed -ne '/^root:/s/^root:\([^:]*\):.*$/\1/p' /etc/shadow)"
diff --git a/package/base-files/files/etc/uci-defaults/12_network-generate-ula b/package/base-files/files/etc/uci-defaults/12_network-generate-ula
index 8871427c60..19d7ed7f2e 100644
--- a/package/base-files/files/etc/uci-defaults/12_network-generate-ula
+++ b/package/base-files/files/etc/uci-defaults/12_network-generate-ula
@@ -1,5 +1,3 @@
-#!/bin/sh
-
[ "$(uci -q get network.globals.ula_prefix)" != "auto" ] && exit 0
r1=$(dd if=/dev/urandom bs=1 count=1 |hexdump -e '1/1 "%02x"')
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
similarity index 94%
rename from package/base-files/files/etc/uci-defaults/13_fix_group_user
rename to package/base-files/files/etc/uci-defaults/13_fix-group-user
index e6dae2419f..bf9febdfe4 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
@@ -1,5 +1,3 @@
-#!/bin/sh
-
. /lib/functions.sh
for file in `grep -sl Require-User /usr/lib/opkg/info/*.control`; do
--
2.20.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list