diff options
| author | Dirk Brenken <dev@brenken.org> | 2018-10-17 08:13:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 08:13:17 +0200 |
| commit | 995f6e0e806296b31916a949d3de2a878bdade62 (patch) | |
| tree | ab6dbbe5a7b02a4a40b5394ff82e4922fea74a10 /net | |
| parent | 797776a3b3a2c886c325831eacea85e3d94104e4 (diff) | |
| parent | 409feb8ef6b81525d8d55e4b40b392d35848a58c (diff) | |
Merge pull request #7199 from Andy2244/samba4-fix_hostname
samba4: fix hostname if not defined via Dnsmasq
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba4/Makefile | 2 | ||||
| -rw-r--r-- | net/samba4/files/samba.init | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/samba4/Makefile b/net/samba4/Makefile index c724d1445..f6e8b43d0 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=samba PKG_VERSION:=4.9.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com> PKG_LICENSE:=GPL-3.0-only diff --git a/net/samba4/files/samba.init b/net/samba4/files/samba.init index 7034330f7..09714f016 100644 --- a/net/samba4/files/samba.init +++ b/net/samba4/files/samba.init @@ -21,9 +21,7 @@ smb_header() { local workgroup description charset # we dont use netbios anymore as default and wsd/avahi is dns based - local hostname="$(uci get system.@system[0].hostname)" - local domain="$(uci get dhcp.@dnsmasq[0].domain)" - [ -n "$domain" ] && hostname="$hostname.$domain" + local hostname="$(cat /proc/sys/kernel/hostname)" config_get workgroup $1 workgroup "WORKGROUP" config_get description $1 description "Samba on OpenWrt" |