diff --git a/TODO b/TODO index 2bf08e8..a41f6cb 100644 --- a/TODO +++ b/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 @@ -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 diff --git a/VERSION b/VERSION index 64d0a44..cf87b87 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3-alpha6 +0.3-alpha7 diff --git a/files/board/arpl/overlayfs/etc/samba/smb.conf b/files/board/arpl/overlayfs/etc/samba/smb.conf new file mode 100644 index 0000000..ddf07ec --- /dev/null +++ b/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 diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index 2e82e91..dea1aa5 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -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 @@ -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 " @@ -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 @@ -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" diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index 95d4ebf..cff514c 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index cc871e1..ab46c35 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -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}"` diff --git a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko deleted file mode 100644 index 53ce1e8..0000000 Binary files a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko.gz b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko.gz new file mode 100644 index 0000000..50565c1 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko deleted file mode 100644 index 0d07ca5..0000000 Binary files a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko.gz b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko.gz new file mode 100644 index 0000000..fc70e50 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-apollolake-4.4.180-prod.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko deleted file mode 100644 index f167db8..0000000 Binary files a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko.gz b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko.gz new file mode 100644 index 0000000..5621ef6 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko deleted file mode 100644 index 8308f49..0000000 Binary files a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko.gz b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko.gz new file mode 100644 index 0000000..b501a4e Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-broadwell-4.4.180-prod.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko deleted file mode 100644 index c8fbb2c..0000000 Binary files a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko.gz b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko.gz new file mode 100644 index 0000000..a222fd2 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko deleted file mode 100644 index a55552c..0000000 Binary files a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko.gz b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko.gz new file mode 100644 index 0000000..7775415 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-broadwellnk-4.4.180-prod.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko deleted file mode 100644 index 07ffd0a..0000000 Binary files a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko.gz b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko.gz new file mode 100644 index 0000000..69d7c50 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko deleted file mode 100644 index bf9c39d..0000000 Binary files a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko.gz b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko.gz new file mode 100644 index 0000000..1224564 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-bromolow-3.10.108-prod.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko deleted file mode 100644 index e776844..0000000 Binary files a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko.gz b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko.gz new file mode 100644 index 0000000..93f94d1 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko deleted file mode 100644 index 122c96d..0000000 Binary files a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko.gz b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko.gz new file mode 100644 index 0000000..5bfd956 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-denverton-4.4.180-prod.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko deleted file mode 100644 index 75166ae..0000000 Binary files a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko.gz b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko.gz new file mode 100644 index 0000000..bfca36a Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko deleted file mode 100644 index d7faf7d..0000000 Binary files a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko.gz b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko.gz new file mode 100644 index 0000000..127f847 Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-geminilake-4.4.180-prod.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko deleted file mode 100644 index c428986..0000000 Binary files a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko.gz b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko.gz new file mode 100644 index 0000000..f63a22f Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-dev.ko.gz differ diff --git a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko deleted file mode 100644 index 3edbb65..0000000 Binary files a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko and /dev/null differ diff --git a/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko.gz b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko.gz new file mode 100644 index 0000000..571d70c Binary files /dev/null and b/files/board/arpl/p3/lkms/rp-v1000-4.4.180-prod.ko.gz differ diff --git a/files/configs/arpl_defconfig b/files/configs/arpl_defconfig index c76b35e..5717998 100644 --- a/files/configs/arpl_defconfig +++ b/files/configs/arpl_defconfig @@ -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 @@ -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 @@ -62,4 +62,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_R8168=y BR2_PACKAGE_R8125=y -