From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 25 Dec 2018 19:30:12 +0000 (+0100)
Subject: samba36: append config from /var/run/config/ for runtime shares
X-Git-Tag: v19.07.0-rc1~1637
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5a59e2c059866bb8ca5b41cce34d49b2ddbd3a4e;p=openwrt%2Fstaging%2Fpepe2k.git

samba36: append config from /var/run/config/ for runtime shares

This will allow automation/hotplug.d scripts to store runtime shares in
the /var/run/config/samba. It's useful e.g. for USB drives that user
wants to be automatically shared.

Using /var/run/config/ provides:
1) Automated cleaning on reboots
   It's important for consistency (to avoid sharing non-existing drives)
2) Safety for user non-commited changes
   Automated scripts should never call "uci [foo] commit" as that could
   flush incomplete config.

Another minor gain is avoiding flash wearing for runtime setup.

Cc: Rosy Song <rosysong@rosinson.com>
Cc: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/network/services/samba36/files/samba.init b/package/network/services/samba36/files/samba.init
index 1c5bb3b3c4..abe8e8f5c7 100755
--- a/package/network/services/samba36/files/samba.init
+++ b/package/network/services/samba36/files/samba.init
@@ -84,6 +84,8 @@ smb_add_share() {
 
 init_config() {
 	config_load samba
+	CONFIG_APPEND=1 UCI_CONFIG_DIR=/var/run/config config_load samba
+
 	config_foreach smb_header samba
 	config_foreach smb_add_share sambashare
 }