添加 Tips 功能，更新相关文件以支持提示信息的显示和存储

.github/workflows/issues.yml

@@ -43,6 +43,7 @@ jobs:
           language= ''
           sn = ''
           macs = ''
+          tips = ''
           model = ''
           version = ''
           kernel = ''
@@ -58,6 +59,7 @@ jobs:
                   language = jsonbody.get('language', '')
                   sn = jsonbody.get('sn', '')
                   macs = jsonbody.get('macs', '')
+                  tips = jsonbody.get('tips', '')
                   model = jsonbody.get('model', '')
                   version = jsonbody.get('version', '')
                   kernel = jsonbody.get('kernel', '')
@@ -79,6 +81,7 @@ jobs:
           set_output("language", language)
           set_output("sn", sn)
           set_output("macs", macs)
+          set_output("tips", tips)
           set_output("model", model)
           set_output("version", version)
           set_output("kernel", kernel)
@@ -248,7 +251,7 @@ jobs:
             USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
             writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}"
           fi
-          
+
           if [ -n "${{ env.macs }}" ]; then
             echo "set macs: ${{ env.macs }}"
             USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
@@ -257,6 +260,11 @@ jobs:
             writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}"
           fi
 
+          if [ -n "${{ env.tips }}" ]; then
+            echo "set tips: ${{ env.tips }}"
+            echo -e "${{ env.tips }}" | sudo tee rr/ws/mnt/p3/AddTips
+          fi
+
           if [ -n "${{ env.addons }}" ]; then
             echo "set addons: ${{ env.addons }}"
             USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
@@ -415,14 +423,6 @@ jobs:
             ----
           emoji: hooray
 
-      - name: Close Issues
-        if: env.iscustom == 'true' && success()
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'close-issue'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-
       - name: Update Comment Fail
         if: env.iscustom == 'true' && failure()
         uses: actions-cool/issues-helper@v3
@@ -437,3 +437,11 @@ jobs:
             > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}  
             ----
           emoji: confused
+
+      - name: Close Issues
+        if: env.iscustom == 'true'
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'close-issue'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}

docs/issues.html

@@ -107,9 +107,11 @@
               if (debug) {
                 $('#sn_item').show();
                 $('#macs_item').show();
+                $('#tips_item').show();
               } else {
                 $('#sn_item').hide();
                 $('#macs_item').hide();
+                $('#tips_item').hide();
               }
               setModels();
             });
@@ -279,7 +281,7 @@
       var body = {};
       var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
       if (debug) {
-        _parameters.push("sn", "macs");
+        _parameters.push("sn", "macs", "tips");
       }
       for (var key in _parameters) {
         var name = _parameters[key];
@@ -432,6 +434,14 @@
         <input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input>
       </div>
     </div>
+    <div class="form-group mt-1 mb-2" id="tips_item">
+      <div class="form-group-header">
+        <label class="color-fg-default text-mono f6">Tips:</label>
+      </div>
+      <div class="form-group-body">
+        <input class="form-control input-contrast input-sm" type="text" id="tips" name="inputs[tips]" value=""></input>
+      </div>
+    </div>
     <div class="form-group mt-1 mb-2" id="model_item">
       <div class="form-group-header">
         <label class="color-fg-default text-mono f6">Model:</label>

files/initrd/opt/rr/boot.sh

@@ -433,6 +433,7 @@ else
 
   _bootwait || exit 0
 
+  [ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
   printf "\033[1;37m%s\033[0m\n" "$(TEXT "Loading DSM kernel ...")"
 
   DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")"

files/initrd/opt/rr/include/consts.sh

@@ -38,6 +38,7 @@ RR_RAMUSER_FILE="${PART3_PATH}/initrd-rru"
 MC_RAMDISK_FILE="${PART3_PATH}/microcode.img"
 MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm"
 MOD_RDGZ_FILE="${PART3_PATH}/initrd-dsm"
+ADD_TIPS_FILE="${PART3_PATH}/AddTips"
 
 CKS_PATH="${PART3_PATH}/cks"
 LKMS_PATH="${PART3_PATH}/lkms"

files/initrd/opt/rr/init.sh

@@ -239,6 +239,7 @@ printf "\n"
 printf "$(TEXT "Call \033[1;32minit.sh\033[0m to re get init info\n")"
 printf "$(TEXT "Call \033[1;32mmenu.sh\033[0m to configure loader\n")"
 printf "\n"
+[ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
 printf "$(TEXT "User config is on \033[1;32m%s\033[0m\n")" "${USER_CONFIG_FILE}"
 printf "$(TEXT "HTTP: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${HTTP:-7080}"
 printf "$(TEXT "DUFS: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${DUFS:-7304}"

files/mnt/p1/boot/grub/grub.cfg

@@ -75,7 +75,9 @@ background_image ${prefix}/logo.png
 
 set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset nowatchdog"
 
-search --set=root --label "RR3"
+insmod part_gpt
+insmod lvm
+search --set=root --label "RR3" --no-floppy
 if [ -e /initrd-rru ]; then set RRU=/initrd-rru; fi
 if [ -e /microcode.img ]; then set MCI=/microcode.img; fi