jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

samba: samba-config: call smbpasswd with valid smb.conf

Browse Source 
Use fresh created tempfile as parameter. Allow smbpasswd logging to
journal to catch errors.
This commit is contained in:
mglae 2023-06-03 15:29:27 +02:00
parent 1bded02269
commit b3d8150bea
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/network/samba/scripts/samba-config
View File

@ -98,14 +98,15 @@ if [ ! -f /storage/.cache/services/samba.disabled ]; then
# processing continues, so if user chooses root as username, second line overrides the first # processing continues, so if user chooses root as username, second line overrides the first
# this is done always in case user uses passwords in userconf. # this is done always in case user uses passwords in userconf.
# many thanks to viljoviitanen for this # many thanks to viljoviitanen for this
printf "%s\n%s" "${SAMBA_PASSWORD}" "${SAMBA_PASSWORD}" | smbpasswd -s -a root >/dev/null 2>&1
printf 'nobody = root\nroot = "%s"\n' "${SAMBA_USERNAME}" > /run/samba/samba.map
sed -e 's|^.[ \t]*.public.=.*| public = no |' \ sed -e 's|^.[ \t]*.public.=.*| public = no |' \
-e 's|^.[ \t]*.username map.=.*||' \ -e 's|^.[ \t]*.username map.=.*||' \
-e 's|^.[ \t]*.security.=.*| security = user\n username map = /run/samba/samba.map|' \ -e 's|^.[ \t]*.security.=.*| security = user\n username map = /run/samba/samba.map|' \
-e 's|^.[ \t]*.map.to.guest.=.*| map to guest = Never|' \ -e 's|^.[ \t]*.map.to.guest.=.*| map to guest = Never|' \
-i ${SMB_TMP} -i ${SMB_TMP}
printf "%s\n%s" "${SAMBA_PASSWORD}" "${SAMBA_PASSWORD}" | smbpasswd -c ${SMB_TMP} -s -a root
printf 'nobody = root\nroot = "%s"\n' "${SAMBA_USERNAME}" > /run/samba/samba.map
else else
sed -e 's|^.[ \t]*.public.=.*| public = yes |' \ sed -e 's|^.[ \t]*.public.=.*| public = yes |' \
-e 's|^.[ \t]*.username map.=.*||' \ -e 's|^.[ \t]*.username map.=.*||' \