Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #2648

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Dev #2648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dc044a
tree: multiple fix
AuxXxilium Jul 25, 2024
9574727
arc: remove ipv6 switch and enable it globally
AuxXxilium Jul 25, 2024
3a28bf0
arc: fix spaces
AuxXxilium Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
tree: multiple fix 
Signed-off-by: AuxXxilium <[email protected]>
  • Loading branch information
@AuxXxilium
AuxXxilium committed Jul 25, 2024
commit 6dc044aec0d34618eb04602c32df580352061911
1 change: 1 addition & 0 deletions files/initrd/opt/arc/arc-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,6 +1714,7 @@ function forcessh() {
fi
(
ONBOOTUP=""
ONBOOTUP="${ONBOOTUP}systemctl restart inetd\n"
ONBOOTUP="${ONBOOTUP}synowebapi --exec api=SYNO.Core.Terminal method=set version=3 enable_telnet=true enable_ssh=true ssh_port=22 forbid_console=false\n"
ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''ARCONBOOTUPARC_SSH'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
mkdir -p "${TMP_PATH}/mdX"
Expand Down
13 changes: 5 additions & 8 deletions files/initrd/opt/arc/boot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ function bootDSM () {
NVPCI_ADDR=$(lspci -nd 10de: | grep -e 0300 -e 0302 | awk '{print $1}')
if [ -n "${NVPCI_ADDR}" ]; then
modprobe -r nouveau || true
NVDEV_PATH=$(find /sys/devices -name *${NVPCI_ADDR} | grep -v supplier)
for DEV_PATH in ${NVDEV_PATH}
do
NVDEV_PATH=$(find /sys/devices -name *${NVPCI_ADDR} | grep -v supplier)
for DEV_PATH in ${NVDEV_PATH}; do
if [ -e ${DEV_PATH}/reset ]; then
echo 1 > ${DEV_PATH}/reset || true
echo 1 > ${DEV_PATH}/reset || true
fi
done
fi
Expand Down Expand Up @@ -161,10 +160,8 @@ function bootDSM () {
CMDLINE['modprobe.blacklist']+="mpt3sas"
fi
fi
if true; then
[ "${CMDLINE['modprobe.blacklist']}" != "" ] && CMDLINE['modprobe.blacklist']+=","
CMDLINE['modprobe.blacklist']+="evbug"
fi
CMDLINE['kvm.ignore_msrs']="1"
CMDLINE['kvm.report_ignored_msrs']="0"
if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
CMDLINE["intel_iommu"]="igfx_off"
fi
Expand Down
2 changes: 1 addition & 1 deletion files/p1/boot/grub/grub.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ set menu_color_normal=white/black
set menu_color_highlight=white/red
set color_normal=white/black

set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1 nox2apic nomodeset"
set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1 nox2apic nomodeset iommu=off"

search --set=root --label "ARC3"
if [ -e /automated ]; then
Expand Down