saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/samba b/init.d/samba
index bf162ad7452283247e5b127696f92bdba30c866b..52a9b68bba80d17e7ecb332ebeef6f6d13f3f5d9 100755 (executable)
--- a/init.d/samba
+++ b/init.d/samba
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 extra_started_commands="reload"
 piddir="/run/samba"

diff --git a/samba/smb.conf.default b/samba/smb.conf.default
index bb9c2e25eb062bd3a8aa00709817e3d3dadb911f..85e2e17f14d51ec4c2ed23fac35f57f4b4875aaf 100644 (file)
--- a/samba/smb.conf.default
+++ b/samba/smb.conf.default
@@ -33,7 +33,7 @@
 # domain controller", "classic backup domain controller", "active
 # directory domain controller".
 #
-# Most people will want "standalone sever" or "member server".
+# Most people will want "standalone server" or "member server".
 # Running as "active directory domain controller" will require first
 # running "samba-tool domain provision" to wipe databases and create a
 # new domain.
@@ -52,7 +52,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /usr/local/samba/var/log.%m
+   log file = /var/log/samba/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
@@ -70,7 +70,7 @@
 # of the machine that is connecting.
 # Note: Consider carefully the location in the configuration file of
 #       this line.  The included file is read at that point.
-;   include = /usr/local/samba/lib/smb.conf.%m
+;   include = /etc/samba/smb.conf.%m
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
@@ -118,7 +118,7 @@
 # Un-comment the following and create the netlogon directory for Domain Logons
 ; [netlogon]
 ;   comment = Network Logon Service
-;   path = /usr/local/samba/lib/netlogon
+;   path = /var/lib/samba/netlogon
 ;   guest ok = yes
 ;   writable = no
 ;   share modes = no
@@ -127,7 +127,7 @@
 # Un-comment the following to provide a specific roving profile share
 # the default is to use the user's home directory
 ;[Profiles]
-;    path = /usr/local/samba/profiles
+;    path = /var/lib/samba/profiles
 ;    browseable = no
 ;    guest ok = yes
 
@@ -136,7 +136,7 @@
 # specifically define each individual printer
 [printers]
    comment = All Printers
-   path = /usr/spool/samba
+   path = /var/spool/samba
    browseable = no
 # Set public = yes to allow user 'guest account' to print
    guest ok = no