Adapt to 69057

marchfun1 · Sep 26, 2023 · caedcf0 · caedcf0
1 parent e6fbd67
commit caedcf0
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 0 deletions.
diff --git a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-init-script-v4-69057.patch b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-init-script-v4-69057.patch
@@ -0,0 +1,36 @@
+--- a/linuxrc.syno.impl
++++ b/linuxrc.syno.impl
+@@ -51,6 +51,8 @@
+ UnknownSynoPartitionMigrationFlag="/.unknown_syno_partition_migrate"
+ IncompatibleRootDevice="/.incompatible_root_device"
+
++/addons/addons.sh early
++
+ UmountRoot()
+ {
+ 	grep "^${RootDevice}" /proc/mounts && /bin/umount -f ${Mnt}
+@@ -67,6 +69,7 @@
+ 	# show date for login info
+ 	date
+
++	/addons/addons.sh jrExit
+ 	if [ "$1" -eq 0 ]; then
+ 		TryRestoringDeviceBackToSwapRaid
+ 	fi
+@@ -176,6 +179,8 @@
+ echo "Insert basic USB modules..."
+ SYNOLoadModules $USB_MODULES
++
++/addons/addons.sh modules
+
+ # insert Etron USB3.0 drivers
+
+ if [ $KERNEL_VCODE -ge "$(KernelVersionCode "3.10")" ]; then
+@@ -224,6 +229,7 @@
+ 		fi
+ fi
+
++/addons/addons.sh patches
+ LoadBrmModules
+
+ if [ "$KERNEL_VCODE" -ge "$(KernelVersionCode "5.10")" ]; then
diff --git a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-init-script-v5-69057.patch b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-init-script-v5-69057.patch
@@ -0,0 +1,39 @@
+--- a/linuxrc.syno.impl
++++ b/linuxrc.syno.impl
+@@ -51,6 +51,9 @@
+ UnknownSynoPartitionMigrationFlag="/.unknown_syno_partition_migrate"
+ IncompatibleRootDevice="/.incompatible_root_device"
+
++insmod /usr/lib/modules/rp.ko
++/addons/addons.sh early
++
+ UmountRoot()
+ {
+ 	grep "^${RootDevice}" /proc/mounts && /bin/umount -f ${Mnt}
+@@ -67,6 +69,8 @@
+ 	# show date for login info
+ 	date
+
++	rmmod rp
++	/addons/addons.sh jrExit
+ 	if [ "$1" -eq 0 ]; then
+ 		TryRestoringDeviceBackToSwapRaid
+ 	fi
+@@ -176,6 +179,8 @@
+ echo "Insert basic USB modules..."
+ SYNOLoadModules $USB_MODULES
+
++/addons/addons.sh modules
++
+ # insert Etron USB3.0 drivers
+
+ if [ $KERNEL_VCODE -ge "$(KernelVersionCode "3.10")" ]; then
+@@ -224,6 +229,8 @@
+ 		fi
+ fi
+
++/addons/addons.sh patches
++
+ LoadBrmModules
+
+ if [ "$KERNEL_VCODE" -ge "$(KernelVersionCode "5.10")" ]; then
diff --git a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-post-init-script-69057.patch b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-post-init-script-69057.patch
@@ -0,0 +1,31 @@
+--- a/usr/sbin/init.post
++++ b/usr/sbin/init.post
+@@ -31,7 +31,28 @@
+ fi
+
+ Mount "$(GetRootMountOpt)" "$(GetRootMountPath)" /tmpRoot
++############################################################################################
++SED_PATH='/tmpRoot/usr/bin/sed'
+
++@@@CONFIG-MANIPULATORS-TOOLS@@@
++
++@@@CONFIG-GENERATED@@@
++
++UPSTART="/tmpRoot/usr/share/init"
++
++if ! echo; then
++  _replace_in_file '^start on' '#start on' $UPSTART/tty.conf
++  _replace_in_file "console output" "console none" $UPSTART/syno_poweroff_task.conf
++  _replace_in_file "console output" "console none" $UPSTART/burnin_loader.conf
++  _replace_in_file "console output" "console none" $UPSTART/udevtrigger.conf
++  _replace_in_file "console output" "console none" $UPSTART/bs-poweroff.conf
++  _replace_in_file "console output" "console none" $UPSTART/udevd.conf
++else
++  _replace_in_file '^#start on' 'start on' $UPSTART/tty.conf
++fi
++
++/addons/addons.sh late
++############################################################################################
+ Mkdir -p /tmpRoot/initrd
+
+ Umount /proc >/dev/null 2>&1