From c5e0c3822ae38af560f5aaaa4a8bb1c27f1362c5 Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Sat, 29 Sep 2018 02:05:19 +0200 Subject: [PATCH] samba4: fix missing busybox 'hostname -f' command * busybox does not have 'hostname' by default so replaced it with uci calls Signed-off-by: Andy Walsh --- net/samba4/Makefile | 2 +- net/samba4/files/samba.init | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/samba4/Makefile b/net/samba4/Makefile index c19797b9be..c724d14454 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:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-3.0-only diff --git a/net/samba4/files/samba.init b/net/samba4/files/samba.init index beafd99626..7034330f70 100644 --- a/net/samba4/files/samba.init +++ b/net/samba4/files/samba.init @@ -21,7 +21,9 @@ smb_header() { local workgroup description charset # we dont use netbios anymore as default and wsd/avahi is dns based - local hostname="$(hostname -f)" + local hostname="$(uci get system.@system[0].hostname)" + local domain="$(uci get dhcp.@dnsmasq[0].domain)" + [ -n "$domain" ] && hostname="$hostname.$domain" config_get workgroup $1 workgroup "WORKGROUP" config_get description $1 description "Samba on OpenWrt"