Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Added samba #65

Merged
merged 1 commit into from Jul 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion TODO
@@ -1,5 +1,4 @@
A fazer
- Validar netif_num e macX
- Descobrir como é o serial do DS2422+
- Estudar acrescentar modo simples e avançado do menu

Expand Down Expand Up @@ -28,3 +27,4 @@ Concluidos:
- Acertar flag DIRTY ao atualizar módulos, etc
- Consertar MAC custom
- Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
- Validar netif_num e macX
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
0.3-alpha6
0.3-alpha7
18 changes: 18 additions & 0 deletions files/board/arpl/overlayfs/etc/samba/smb.conf
@@ -0,0 +1,18 @@
[global]
workgroup = WORKGROUP
server role = standalone server
obey pam restrictions = yes
map to guest = Bad User
usershare allow guests = yes
[arpl]
browseable = yes
public = yes
path = /mnt
guest ok = yes
printable = no
read only = no
writable = yes
create mask = 0600
directory mask = 0700
force user = root
force group = root
19 changes: 15 additions & 4 deletions files/board/arpl/overlayfs/opt/arpl/boot.sh
Expand Up @@ -48,6 +48,9 @@ MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"

echo -e "Model: \033[1;36m${MODEL}\033[0m"
echo -e "Build: \033[1;36m${BUILD}\033[0m"

declare -A CMDLINE

# Fixed values
Expand Down Expand Up @@ -82,6 +85,17 @@ if [ "${BUS}" = "ata" ]; then
DOM="`readModelKey "${MODEL}" "dom"`"
fi

# Validate netif_num
NETIF_NUM=${CMDLINE["netif_num"]}
MACS=0
for N in `seq 1 4`; do
[ -n "${CMDLINE["mac${N}"]}" ] && MACS=$((${MACS}+1))
done
if [ ${NETIF_NUM} -ne ${MACS} ]; then
echo -e "\033[1;33m*** netif_num is not equal to macX amount, set netif_num to ${MACS} ***\033[0m"
CMDLINE["netif_num"]=${MACS}
fi

# Prepare command line
CMDLINE_LINE=""
grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
Expand All @@ -96,9 +110,6 @@ done
# Escape special chars
CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`

# Inform user
echo -e "Model: \033[1;36m${MODEL}\033[0m"
echo -e "Build: \033[1;36m${BUILD}\033[0m"
echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"

# Wait for an IP
Expand All @@ -121,7 +132,7 @@ done
echo -e "\033[1;37mLoading DSM kernel...\033[0m"

# Executes DSM kernel via KEXEC
history -a
history -w
sync
if [ "${EFI_BUG}" = "yes" -a ${EFI} -eq 1 ]; then
echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
Expand Down
2 changes: 1 addition & 1 deletion files/board/arpl/overlayfs/opt/arpl/include/consts.sh
@@ -1,5 +1,5 @@

ARPL_VERSION="0.3-alpha6"
ARPL_VERSION="0.3-alpha7"

# Define paths
TMP_PATH="/tmp"
Expand Down
2 changes: 1 addition & 1 deletion files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
Expand Up @@ -98,7 +98,7 @@ echo -n "."
# Copying fake modprobe
cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
# Copying LKM to /usr/lib/modules
cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
gzip -dc "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko.gz" > "${RAMDISK_PATH}/usr/lib/modules/rp.ko"

# Addons
MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"`
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko
Binary file not shown.
Binary file not shown.
Binary file removed files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko
Binary file not shown.
Binary file not shown.
3 changes: 1 addition & 2 deletions files/configs/arpl_defconfig
Expand Up @@ -26,7 +26,6 @@ BR2_PACKAGE_BINUTILS_TARGET=y
BR2_PACKAGE_CPIO=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_ACPID=y
BR2_PACKAGE_KBD=y
Expand All @@ -45,6 +44,7 @@ BR2_PACKAGE_PCRE2=y
BR2_PACKAGE_DHCPCD=y
BR2_PACKAGE_OPENSSH=y
# BR2_PACKAGE_OPENSSH_CLIENT is not set
BR2_PACKAGE_SAMBA4=y
BR2_PACKAGE_BASH_COMPLETION=y
BR2_PACKAGE_DIALOG=y
BR2_PACKAGE_TTYD=y
Expand All @@ -62,4 +62,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_E2FSPROGS=y
BR2_PACKAGE_R8168=y
BR2_PACKAGE_R8125=y