Browse Source

Merge pull request #10616 from Andy2244/samba4-22-11-2019

samba4: add UCI option 'disable_async_io'
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
9d57b11e44
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 17 deletions
  1. +1
    -1
      net/samba4/Makefile
  2. +0
    -2
      net/samba4/files/samba.config
  3. +8
    -14
      net/samba4/files/samba.init

+ 1
- 1
net/samba4/Makefile View File

@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=samba
PKG_VERSION:=4.9.15
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.heanet.ie/mirrors/ftp.samba.org/stable/ \


+ 0
- 2
net/samba4/files/samba.config View File

@ -2,5 +2,3 @@ config samba
option 'workgroup' 'WORKGROUP'
option 'description' 'Samba on OpenWrt'
option 'charset' 'UTF-8'
option 'homes' '0'

+ 8
- 14
net/samba4/files/samba.init View File

@ -33,6 +33,7 @@ smb_header() {
config_get_bool DISABLE_NETBIOS $1 disable_netbios 0
config_get_bool DISABLE_AD_DC $1 disable_ad_dc 0
config_get_bool DISABLE_WINBIND $1 disable_winbind 0
config_get_bool DISABLE_ASYNC_IO $1 disable_async_io 0
mkdir -p /var/etc
sed -e "s#|NAME|#$hostname#g" \
@ -47,20 +48,13 @@ smb_header() {
if [ "$DISABLE_NETBIOS" -eq 1 ] || [ ! -x /usr/sbin/nmbd ]; then
printf "\tdisable netbios = yes\n"
fi
local homes
config_get_bool homes $1 homes 0
[ $homes -gt 0 ] && {
cat <<EOT
[homes]
comment = Home Directories
browsable = no
writable = yes
read only = no
create mask = 0750
EOT
}
if [ "$DISABLE_ASYNC_IO" -eq 1 ]; then
printf "\taio read size = 0\n"
printf "\taio write size = 0\n"
# sendfile bug: https://bugzilla.samba.org/show_bug.cgi?id=14095
printf "\tuse sendfile = no\n"
fi
} >> /var/etc/smb.conf
[ -e /etc/samba/smb.conf ] || ln -nsf /var/etc/smb.conf /etc/samba/smb.conf


Loading…
Cancel
Save