tree: rename stable -> minimal / next -> extended

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

.github/workflows/build.yml

@@ -32,14 +32,14 @@ on:
         description: "pre release"
         default: false
         type: boolean
-      next:
+      minimal:
-        description: "next"
+        description: "minimal"
-        default: false
-        type: boolean
-      stable:
-        description: "stable"
         default: true
         type: boolean
+      extended:
+        description: "extended"
+        default: false
+        type: boolean
       clean:
         description: "clean"
         default: false
@@ -112,15 +112,15 @@ jobs:
           echo "OK"
 
        # Build incremental
-      - name: Build Next Image
+      - name: Build extended Image
-        if: ${{ inputs.next }}
+        if: ${{ inputs.extended }}
         run: |
           . scripts/func.sh
 
           # Modify Source File
           ARC_BUILD="`date +'%y%m%d'`"
           ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="next"
+          ARC_BRANCH="extended"
           echo "${ARC_BUILD}" >files/p1/ARC-BUILD
           echo "${ARC_VERSION}" >files/p1/ARC-VERSION
           echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -174,8 +174,8 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
       # Zip image and generate checksum
-      - name: Pack Next Image
+      - name: Pack extended Image
-        if: ${{ inputs.next }}
+        if: ${{ inputs.extended }}
         run: |
           if [ -n "${{ env.ARC_VERSION }}" ]; then
             zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -193,15 +193,15 @@ jobs:
           rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc"
 
        # Build incremental
-      - name: Build Stable Image
+      - name: Build minimal Image
-        if: ${{ inputs.stable }}
+        if: ${{ inputs.minimal }}
         run: |
           . scripts/func.sh
 
           # Modify Source File
           ARC_BUILD="`date +'%y%m%d'`"
           ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="stable"
+          ARC_BRANCH="minimal"
           echo "${ARC_BUILD}" >files/p1/ARC-BUILD
           echo "${ARC_VERSION}" >files/p1/ARC-VERSION
           echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -255,8 +255,8 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
       # Zip image and generate checksum
-      - name: Pack Stable Image
+      - name: Pack minimal Image
-        if: ${{ inputs.stable }}
+        if: ${{ inputs.minimal }}
         run: |
           if [ -n "${{ env.ARC_VERSION }}" ]; then
             zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -286,8 +286,8 @@ jobs:
               - Discord Account for Arc Patch needed
 
             ### Versions:
-              ${{ inputs.stable && '- Stable: Full Image, all dependencies are included, reduced hardware support (if there is a Next image)' || '' }}
+              ${{ inputs.minimal && '- minimal: Full Image, all dependencies are included (reduced size, faster boot)' || '' }}
-              ${{ inputs.next && '- Next: Full Image, all dependencies are included, more hardware support, new features to test' || '' }}
+              ${{ inputs.extended && '- extended: Full Image, all dependencies are included (new features to test)' || '' }}
 
             ### Dependencies:
               - Addons: ${{ env.ADDONTAG }}
@@ -296,8 +296,8 @@ jobs:
               - Patches: ${{ env.PATCHTAG }}
               - Custom: ${{ env.CUSTOMTAG }}
               - LKMs: ${{ env.LKMTAG }}
-              ${{ inputs.stable && format('- Buildroot Stable: {0}', env.BRSTAG) || '' }}
+              ${{ inputs.minimal && format('- Buildroot minimal: {0}', env.BRSTAG) || '' }}
-              ${{ inputs.next && format('- Buildroot Next: {0}', env.BRXTAG) || '' }}
+              ${{ inputs.extended && format('- Buildroot extended: {0}', env.BRXTAG) || '' }}
 
             ### Release
               - ${{ env.BUILD_TIME }}

Taskfile.yaml

@@ -3,17 +3,17 @@
 version: "3"
 
 tasks:
-  build-img-n:
+  build-ext:
     cmds:
       - git reset --hard
       - git pull
-      - ./img-gen-n.sh
+      - ./img-ext.sh
 
-  build-img-s:
+  build-min:
     cmds:
       - git reset --hard
       - git pull
-      - ./img-gen-s.sh
+      - ./img-min.sh
 
   compile-kpatch:
     dir: kpatch

files/initrd/opt/arc/arc-functions.sh

@@ -91,6 +91,7 @@ function addonSelection() {
 ###############################################################################
 # Permit user select the modules to include
 function modulesMenu() {
+  NEXT="1"
   PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
   PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
   KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
@@ -936,16 +937,16 @@ function updateMenu() {
       4)
         dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \
           --menu "Choose a Branch" 0 0 0 \
-          1 "stable - faster Boot than next" \
+          1 "minimal - reduced size and faster boot" \
-          2 "next - Test for upcoming Features/Support" \
+          2 "extended - new features to test" \
           3 "dev - Development only" \
           2>"${TMP_PATH}/opts"
         [ $? -ne 0 ] && break
         opts=$(cat ${TMP_PATH}/opts)
         if [ ${opts} -eq 1 ]; then
-          ARC_BRANCH="stable"
+          ARC_BRANCH="minimal"
         elif [ ${opts} -eq 2 ]; then
-          ARC_BRANCH="next"
+          ARC_BRANCH="extended"
         elif [ ${opts} -eq 3 ]; then
           ARC_BRANCH="dev"
         fi