mgetadmin/arc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree: bugfix II

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium
2024-07-04 20:05:05 +02:00
parent f01316934f
commit e186af796d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
files/initrd/opt/arc/arc-functions.sh
View File

@@ -1567,7 +1567,7 @@ function addNewDSMUser() {
ONBOOTUP=""
ONBOOTUP="${ONBOOTUP}if synouser --enum local | grep -q ^${username}\$; then synouser --setpw ${username} ${password}; else synouser --add ${username} ${password} arc 0 user@arc.arc 1; fi\n"
ONBOOTUP="${ONBOOTUP}synogroup --memberadd administrators ${username}\n"
ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''ARCONBOOTUPRR_ADDUSER'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''ARCONBOOTUPARC_ADDUSER'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
mkdir -p "${TMP_PATH}/mdX"
for I in ${DSMROOTS}; do
@@ -1575,8 +1575,8 @@ function addNewDSMUser() {
[ $? -ne 0 ] && continue
if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
sqlite3 ${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db <<EOF
DELETE FROM task WHERE task_name LIKE 'ARCONBOOTUPRR_ADDUSER';
INSERT INTO task VALUES('ARCONBOOTUPRR_ADDUSER', '', 'bootup', '', 1, 0, 0, 0, '', 0, '$(echo -e ${ONBOOTUP})', 'script', '{}', '', '', '{}', '{}');
DELETE FROM task WHERE task_name LIKE 'ARCONBOOTUPARC_ADDUSER';
INSERT INTO task VALUES('ARCONBOOTUPARC_ADDUSER', '', 'bootup', '', 1, 0, 0, 0, '', 0, '$(echo -e ${ONBOOTUP})', 'script', '{}', '', '', '{}', '{}');
EOF
sleep 1
sync

4
files/initrd/opt/arc/arc.sh
View File

@@ -854,7 +854,7 @@ function juniorboot() {
dialog --backtitle "$(backtitle)" --title "Arc Boot" \
--infobox "Booting DSM Reinstall Mode...\nPlease stay patient!" 4 30
sleep 2
rebootTo "junior"
rebootTo junior
}
###############################################################################
@@ -1158,7 +1158,7 @@ else
fi
fi
sleep 3
rebootTo "config"
rebootTo config
NEXT="c"
;;
l) editUserConfig; NEXT="l" ;;

2
files/initrd/opt/arc/boot.sh
View File

@@ -218,7 +218,7 @@ function bootDSM () {
elif [ "${DIRECTBOOT}" == "false" ]; then
BOOTIPWAIT="$(readConfigKey "arc.bootipwait" "${USER_CONFIG_FILE}")"
ETHN="$(echo ${ETHX} | wc -w)"
[ -z "${BOOTIPWAIT}" ] && BOOTIPWAIT=20
[ -z "${BOOTIPWAIT}" ] && BOOTIPWAIT=30
IPCON=""
echo -e "\033[1;34mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m"
sleep 3

2
files/initrd/opt/arc/init.sh
View File

@@ -166,7 +166,7 @@ fi
echo
BOOTIPWAIT="$(readConfigKey "arc.bootipwait" "${USER_CONFIG_FILE}")"
[ -z "${BOOTIPWAIT}" ] && BOOTIPWAIT=20
[ -z "${BOOTIPWAIT}" ] && BOOTIPWAIT=30
echo -e "\033[1;34mDetected ${ETHN} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m"
sleep 3
for ETH in ${ETHX}; do