commit 295b51231f08c5559f652eb04d35620654354bee Author: AuxXxilium Date: Mon Sep 4 19:30:37 2023 +0200 init: arc patches Signed-off-by: AuxXxilium diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..5d379c4 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: AuxXxilium \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..29700f8 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,80 @@ +name: Build Patches + +on: + workflow_dispatch: + inputs: + version: + description: "format %y.%-m.$i or auto" + required: false + type: string + prerelease: + description: "pre release" + default: false + type: boolean + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@main + with: + fetch-depth: 0 + + - name: Changelog + uses: Bullrich/generate-release-changelog@master + id: Changelog + env: + REPO: ${{ github.repository }} + + - name: Init Env + run: | + git config --global user.email "info@auxxxilium.tech" + git config --global user.name "AuxXxilium" + sudo timedatectl set-timezone "Europe/Berlin" + + - name: Calculate version + run: | + # Calculate Version + VERSION="" + if [ -n "${{ inputs.version }}" ]; then + VERSION="${{ inputs.version }}" + else + LATEST_TAG="$(curl -skL "https://api.github.com/repos/${{ github.repository }}/releases/latest" | jq -r ".tag_name" 2>/dev/null)" + if [[ -n "${LATEST_TAG}" && "`echo ${LATEST_TAG} | cut -d '.' -f 1,2`" = "`date +'%y.%-m.%-d'`" ]]; then # format %y.%-m.$i + VERSION="`echo ${LATEST_TAG} | awk -F '.' '{$3=$3+1}1' OFS='.'`" + else + VERSION="`date +'%y.%-m.%-d'`" + fi + fi + + if [ -n "${VERSION}" ]; then + # Modify Source File + echo "Version: ${VERSION}" + echo "${VERSION}" >VERSION + echo "VERSION=${VERSION}" >> $GITHUB_ENV + fi + + - name: Build Patches Package + run: | + zip -9 patches.zip -j *.patch *.sh VERSION modulelist + + - name: Upload to Artifacts + if: success() && env.VERSION == '' + uses: actions/upload-artifact@v4 + with: + name: patches + path: | + patches.zip + + - name: Release + if: success() && env.VERSION != '' + uses: ncipollo/release-action@v1 + with: + tag: ${{ env.VERSION }} + prerelease: ${{ inputs.prerelease }} + allowUpdates: true + body: | + ${{ steps.Changelog.outputs.changelog }} + artifacts: | + patches.zip \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0a98ec0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..e992beb --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# Patches for Arc Redpill Loader + +## List of all Modules +https://github.com/AuxXxilium/AuxXxilium/wiki/Arc:-Modules + +### Links + +- Overview +- Wiki and Informations +- Download + +### Thanks +All code was based on the work of TTG, pocopico, jumkey, fbelavenuto and others involved in continuing TTG's original redpill-load project. \ No newline at end of file diff --git a/config-manipulators.sh b/config-manipulators.sh new file mode 100755 index 0000000..1bb5024 --- /dev/null +++ b/config-manipulators.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env sh + +# +# WARNING: this file is also embedded in the post-init patcher, so don't go to crazy with the syntax/tools as it must +# be able to execute in the initramfs/preboot environment (so no bashism etc) +# All comments will be stripped, functions here should NOT start with brp_ as they're not part of the builder + +if [ -z "${SED_PATH+x}" ]; then + echo "Your SED_PATH variable is not set/is empty!" + exit 1 +fi + +##$1 from, $2 to, $3 file to path +_replace_in_file() { + if grep -q "${1}" "${3}"; then + "${SED_PATH}" -i "${3}" -e "s#${1}#${2}#" + fi +} + +# Replace/remove/add values in .conf K=V file +# +# Args: $1 name, $2 new_val, $3 path +_set_conf_kv() { + # Delete + if [ -z "$2" ]; then + "${SED_PATH}" -i "${3}" -e "s/^${1}=.*$//" + return 0 + fi + + # Replace + if grep -q "^${1}=" "${3}"; then + "${SED_PATH}" -i "${3}" -e "s\"^${1}=.*\"${1}=\\\"${2}\\\"\"" + return 0 + fi + + # Add if doesn't exist + echo "${1}=\"${2}\"" >>"${3}" +} diff --git a/iosched-trampoline.sh b/iosched-trampoline.sh new file mode 100755 index 0000000..f6bff73 --- /dev/null +++ b/iosched-trampoline.sh @@ -0,0 +1,16 @@ +#!/usr/bin/sh +# This script is saved to /sbin/modprobe which is a so called UMH (user-mode-helper) for kmod (kernel/kmod.c) +# The kmod subsystem in the kernel is used to load modules from kernel. We exploit it a bit to load RP as soon as +# possible (which turns out to be via init/main.c => load_default_modules => load_default_elevator_module +# When the kernel is booted with "elevator=elevator" it will attempt to load a module "elevator-iosched"... and the rest +# should be obvious from the code below. DO NOT print anything here (kernel doesn't attach STDOUT) +for arg in "$@"; do + if [ "${arg}" = "elevator-iosched" ]; then + insmod /usr/lib/modules/rp.ko + rm /usr/lib/modules/rp.ko + rm /usr/sbin/modprobe + ln -s /usr/bin/kmod /usr/sbin/modprobe + exit 0 + fi +done +exit 1 diff --git a/ramdisk-disable-disabled-ports-00000.patch b/ramdisk-disable-disabled-ports-00000.patch new file mode 100644 index 0000000..3ea5eb7 --- /dev/null +++ b/ramdisk-disable-disabled-ports-00000.patch @@ -0,0 +1,11 @@ +--- a/usr/syno/web/webman/get_state.cgi ++++ b/usr/syno/web/webman/get_state.cgi +@@ -1,7 +1,7 @@ + #!/bin/sh + + PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin" +-DisabledPortDisks=`/usr/syno/bin/synodiskport -portthawlist` ++DisabledPortDisks="" + partition=`/usr/syno/bin/synodiskport -installable_disk_list` + + product=`/bin/get_key_value /etc.defaults/synoinfo.conf product` diff --git a/ramdisk-disable-disabled-ports-42661.patch b/ramdisk-disable-disabled-ports-42661.patch new file mode 100644 index 0000000..5f7b223 --- /dev/null +++ b/ramdisk-disable-disabled-ports-42661.patch @@ -0,0 +1,11 @@ +--- a/usr/syno/web/webman/get_state.cgi ++++ b/usr/syno/web/webman/get_state.cgi +@@ -1,7 +1,7 @@ + #!/bin/sh + + PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin" +-DisabledPortDisks="$(/usr/syno/bin/synodiskport -portthawlist)" ++DisabledPortDisks="" + partition="$(/usr/syno/bin/synodiskport -installable_disk_list)" + + upnpmodelname="$(/bin/get_key_value /etc.defaults/synoinfo.conf upnpmodelname)" diff --git a/ramdisk-disable-root-pwd-00000.patch b/ramdisk-disable-root-pwd-00000.patch new file mode 100644 index 0000000..d4d5b6d --- /dev/null +++ b/ramdisk-disable-root-pwd-00000.patch @@ -0,0 +1,8 @@ +--- a/etc/passwd ++++ b/etc/passwd +@@ -1,4 +1,4 @@ +-root:x:0:0::/root:/bin/ash ++root::0:0::/root:/bin/ash + system:x:1:1::/usr/syno/synoman:/usr/bin/nologin + daemon:x:2:2::/:/bin/sh + lp:x:7:7::/var/spool/lpd:/bin/sh diff --git a/ramdisk-disable-root-pwd-64216.patch b/ramdisk-disable-root-pwd-64216.patch new file mode 100644 index 0000000..84e5460 --- /dev/null +++ b/ramdisk-disable-root-pwd-64216.patch @@ -0,0 +1,8 @@ +--- a/etc/passwd ++++ b/etc/passwd +@@ -1,4 +1,4 @@ +-root:x:0:0::/root:/bin/ash ++root::0:0::/root:/bin/ash + system:x:1:1::/usr/syno/synoman:/usr/bin/nologin + daemon:x:2:2::/:/bin/sh + SYSTEM_ADMIN:x:3:101::/nonexist:/usr/bin/nologin diff --git a/ramdisk-etc-rc-00000.patch b/ramdisk-etc-rc-00000.patch new file mode 100644 index 0000000..068dd83 --- /dev/null +++ b/ramdisk-etc-rc-00000.patch @@ -0,0 +1,9 @@ +--- a/etc/rc ++++ b/etc/rc +@@ -469,5 +469,5 @@ + echo "============ Date ============" + date + echo "==============================" +- ++/addons/addons.sh rcExit + exit 0 diff --git a/ramdisk-init-script-v4-00000.patch b/ramdisk-init-script-v4-00000.patch new file mode 100644 index 0000000..85513b0 --- /dev/null +++ b/ramdisk-init-script-v4-00000.patch @@ -0,0 +1,37 @@ +--- a/linuxrc.syno.impl ++++ b/linuxrc.syno.impl +@@ -38,6 +38,8 @@ + UnknownSynoPartitionMigrationFlag="/.unknown_syno_partition_migrate" + IncompatibleRootDevice="/.incompatible_root_device" + ++/addons/addons.sh early ++ + UmountRoot() + { + grep "^${RootDevice}" /proc/mounts && /bin/umount -f ${Mnt} +@@ -59,5 +61,6 @@ + fi + ++ /addons/addons.sh jrExit + UmountRoot + + exit $1 + } +@@ -155,6 +158,8 @@ + # insert basic USB modules for detect f401/FDT + echo "Insert basic USB modules..." + SYNOLoadModules $USB_MODULES ++ ++/addons/addons.sh modules + + # insert Etron USB3.0 drivers + +@@ -209,6 +214,8 @@ + fi + fi + ++/addons/addons.sh patches ++ + if [ "$SupportDualhead" = "yes" ]; then + # Run HA script + /etc.defaults/AHAtasks check_stage diff --git a/ramdisk-init-script-v4-25556.patch b/ramdisk-init-script-v4-25556.patch new file mode 100644 index 0000000..c6a9c45 --- /dev/null +++ b/ramdisk-init-script-v4-25556.patch @@ -0,0 +1,39 @@ +--- a/linuxrc.syno ++++ b/linuxrc.syno +@@ -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} +@@ -73,6 +75,9 @@ + if [ "$SupportDualhead" = "yes" ]; then + /etc.defaults/AHAtasks stage_change_end + fi ++ ++ /addons/addons.sh jrExit ++ + UmountRoot + exit $1 + } +@@ -154,6 +159,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 +@@ -206,6 +213,8 @@ + fi + fi + ++/addons/addons.sh patches ++ + if [ "$SupportDualhead" = "yes" ]; then + # Run HA script + /etc.defaults/AHAtasks check_stage diff --git a/ramdisk-init-script-v4-64216.patch b/ramdisk-init-script-v4-64216.patch new file mode 100644 index 0000000..c3e1ab6 --- /dev/null +++ b/ramdisk-init-script-v4-64216.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 + UmountRoot + + exit $1 +@@ -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 + + #################################################### diff --git a/ramdisk-init-script-v4-69057.patch b/ramdisk-init-script-v4-69057.patch new file mode 100644 index 0000000..6c82f63 --- /dev/null +++ b/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/ramdisk-init-script-v5-00000.patch b/ramdisk-init-script-v5-00000.patch new file mode 100644 index 0000000..65286e9 --- /dev/null +++ b/ramdisk-init-script-v5-00000.patch @@ -0,0 +1,39 @@ +--- a/linuxrc.syno.impl ++++ b/linuxrc.syno.impl +@@ -49,6 +49,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} +@@ -69,6 +73,8 @@ + /etc.defaults/AHAtasks stage_change_end + fi + ++ rmmod rp ++ /addons/addons.sh jrExit + UmountRoot + + exit $1 +@@ -178,6 +184,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 +@@ -232,6 +240,8 @@ + fi + fi + ++/addons/addons.sh patches ++ + if [ "$SupportDualhead" = "yes" ]; then + # Run HA script + /etc.defaults/AHAtasks check_stage diff --git a/ramdisk-init-script-v5-64216.patch b/ramdisk-init-script-v5-64216.patch new file mode 100644 index 0000000..eb7955f --- /dev/null +++ b/ramdisk-init-script-v5-64216.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 + UmountRoot + + exit $1 +@@ -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 + + #################################################### diff --git a/ramdisk-init-script-v5-69057.patch b/ramdisk-init-script-v5-69057.patch new file mode 100644 index 0000000..32c97e0 --- /dev/null +++ b/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/ramdisk-network-hosts-00000.patch b/ramdisk-network-hosts-00000.patch new file mode 100644 index 0000000..b6c953b --- /dev/null +++ b/ramdisk-network-hosts-00000.patch @@ -0,0 +1,8 @@ +--- /etc/hosts ++++ /etc/hosts +@@ -2,3 +2,5 @@ + # that require network functionality will fail. + 127.0.0.1 localhost + ::1 localhost ++127.0.0.1 update7.synology.com ++127.0.0.1 dataupdate7.synology.com diff --git a/ramdisk-post-init-script-00000.patch b/ramdisk-post-init-script-00000.patch new file mode 100644 index 0000000..c0052bb --- /dev/null +++ b/ramdisk-post-init-script-00000.patch @@ -0,0 +1,32 @@ +--- a/usr/sbin/init.post ++++ b/usr/sbin/init.post +@@ -18,6 +18,29 @@ if [ "$UniqueRD" = "nextkvmx64" ]; then + fi + Mount "$RootDevice" /tmpRoot -o barrier=1 + ++############################################################################################ ++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 diff --git a/ramdisk-post-init-script-25556.patch b/ramdisk-post-init-script-25556.patch new file mode 100644 index 0000000..0ca1c9e --- /dev/null +++ b/ramdisk-post-init-script-25556.patch @@ -0,0 +1,32 @@ +--- a/usr/sbin/init.post ++++ b/usr/sbin/init.post +@@ -18,6 +18,29 @@ + fi + mount $RootDevice /tmpRoot -o barrier=1 + ++############################################################################################ ++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 diff --git a/ramdisk-post-init-script-42661.patch b/ramdisk-post-init-script-42661.patch new file mode 100644 index 0000000..762cd4f --- /dev/null +++ b/ramdisk-post-init-script-42661.patch @@ -0,0 +1,31 @@ +--- a/usr/sbin/init.post ++++ b/usr/sbin/init.post +@@ -31,7 +31,28 @@ + OptPrjQuota="$(GetPQMountOpt "${RootMountPath}")" + # shellcheck disable=SC2046 + Mount "${RootMountPath}" /tmpRoot -o barrier=1 ${OptPrjQuota} ++############################################################################################ ++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 diff --git a/ramdisk-post-init-script-42951.patch b/ramdisk-post-init-script-42951.patch new file mode 100644 index 0000000..e6db176 --- /dev/null +++ b/ramdisk-post-init-script-42951.patch @@ -0,0 +1,31 @@ +--- a/usr/sbin/init.post ++++ b/usr/sbin/init.post +@@ -31,7 +31,28 @@ + OptPrjQuota="$(GetPQMountOpt "${RootMountPath}")" + # shellcheck disable=SC2046 + Mount "${RootMountPath}" /tmpRoot -o barrier=1,noatime ${OptPrjQuota} ++############################################################################################ ++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 diff --git a/ramdisk-post-init-script-69057.patch b/ramdisk-post-init-script-69057.patch new file mode 100644 index 0000000..fff2568 --- /dev/null +++ b/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