Merge branch 'wukongdaily:master' into master

Author: hk318

autobuild/autobuild.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+# 接受从AutoBuildImmortalWrt Action 过来的固件 制作为ISO
+mkdir -p imm
+RECEIVE_FILE="$1"
+filename=$(basename "$RECEIVE_FILE")  # 提取文件名
+OUTPUT_PATH="imm/$filename"
+mv $RECEIVE_FILE $OUTPUT_PATH
+echo "保存路径: $OUTPUT_PATH"
+echo "✅ 验证文件类型!"
+file "$OUTPUT_PATH"
+
+# 根据扩展名解压
+extension="${filename##*.}"  # 获取文件扩展名
+case $extension in
+  gz)
+    echo "gz正在解压$OUTPUT_PATH"
+    gunzip -f "$OUTPUT_PATH" || true
+    final_name=$(find imm -name '*.img' -print -quit)
+    mv "$final_name" "imm/custom.img"
+    ;;
+  zip)
+    echo "zip正在解压$OUTPUT_PATH"
+    unzip -j -o "$OUTPUT_PATH" -d imm/  # -j 忽略目录结构 
+    final_name=$(find imm -name '*.img' -print -quit)
+    mv "$final_name" "imm/custom.img"
+    ;;
+  xz)
+    echo "xz正在解压$OUTPUT_PATH"
+    xz -d --keep "$OUTPUT_PATH"  # 保留原文件 
+    final_name="${OUTPUT_PATH%.*}"
+    mv "$final_name" "imm/custom.img"
+    ;;
+  *)
+    echo "❌ 不支持的压缩格式: $extension"
+    exit 1
+    ;;
+esac
+
+
+# 检查最终文件
+if [ -f "imm/custom.img" ]; then
+  echo "✅ 解压成功"
+  ls -lh imm/
+  echo "✅ 准备合成 自定义OpenWrt 安装器"
+else
+  echo "❌ 错误：最终文件 imm/custom.img 不存在"
+  exit 1
+fi
+
+mkdir -p output
+docker run --privileged --rm \
+    -v $(pwd)/output:/output \
+    -v $(pwd)/supportFiles:/supportFiles:ro \
+    -v $(pwd)/imm/custom.img:/mnt/custom.img \
+    debian:buster \
+    /supportFiles/custom/build.sh

autobuild/info.md

@@ -0,0 +1,18 @@
+[![Github](https://img.shields.io/badge/Release文件可在国内加速站下载-FC7C0D?logo=github&logoColor=fff&labelColor=000&style=for-the-badge)](https://wkdaily.cpolar.top/archives/1) 
+
+#### 格式ISO: 此文件是通过AutoBuildImmortalWrt项目构建的
+#### 适用范围：所有虚拟机和物理机通用 皆可引导 用于安装ImmortalWrt
+#### 使用方法：
+- 虚拟机使用：各种虚拟机直接选择iso 作为开机引导即可
+- 物理机使用：建议将iso放入ventoy的U盘中
+#### 运行ISO的中的debian live系统 大概10几秒后 输入命令 `ddd` 即可调用安装菜单
+<img width="50%" height="50%" alt="image" src="https://github.com/user-attachments/assets/b47821ed-dc1d-41b5-8a6e-814bf222a2f4" />
+
+#### 安装后 默认情况 若没有更改 则固件信息如下
+- 用户名root 密码 无
+- 该固件刷入【单网口设备】默认采用DHCP模式,自动获得ip。类似NAS的做法 可在上一级路由器查询，若是虚拟机则输入 `ip a` 查看
+- 该固件刷入【多网口设备】默认WAN口采用DHCP模式，LAN 口ip为  `192.168.100.1 `其中eth0为WAN 其余网口均为LAN
+#### 为什么这样设计
+- 因为很多人在第一次刷入固件后 都做了很多重复的工作 要编辑`/etc/config/network` 不适合手残党和新手。而且我觉得每次这样修改有点傻 千年不变的糟糕用户体验要变一变 为什么不去web页面里修改呢 有界面操作更简单啊
+- 【单网口】设备直接就是自动获得ip 则不需要你每次都在命令行里修改了。尤其在虚拟机里，ip a 就能查看ip 用此ip就能访问。web页面在修改任何东西 都很简单了。尤其旁路用户 进web页再设置
+- 【多网口】设备用 192.168.100.1 访问web ui

build.sh

@@ -17,7 +17,7 @@ else
   FILE_NAME="Armbian_25.2.1_Uefi-x86_noble_current_6.12.13.img.xz"
 fi
 
-REPO="wukongdaily/armbian-installer"
+REPO="wukongdaily/img-installer"
 TAG="2025-03-12"
 OUTPUT_PATH="armbian/armbian.img.xz"
 

custom.sh

@@ -64,8 +64,8 @@ fi
 
 mkdir -p output
 docker run --privileged --rm \
-        -v $(pwd)/output:/output \
-        -v $(pwd)/supportFiles:/supportFiles:ro \
-        -v $(pwd)/imm/custom.img:/mnt/custom.img \
-        debian:buster \
-        /supportFiles/custom/build.sh
+    -v $(pwd)/output:/output \
+    -v $(pwd)/supportFiles:/supportFiles:ro \
+    -v $(pwd)/imm/custom.img:/mnt/custom.img \
+    debian:buster \
+    /supportFiles/custom/build.sh

supportFiles/build.sh

@@ -1,6 +1,19 @@
 #!/bin/bash
 # Based from https://willhaley.com/blog/custom-debian-live-environment/
+set -e
 
+echo "🔧 修复 buster 的源..."
+
+cat > /etc/apt/sources.list <<EOF
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main
+EOF
+
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until
+
+apt-get update
+
+echo "🚀 开始执行 build.sh ..."
 echo Install required tools
 apt-get update
 apt-get -y install debootstrap squashfs-tools xorriso isolinux syslinux-efi  grub-pc-bin grub-efi-amd64-bin mtools dosfstools parted
@@ -9,8 +22,7 @@ echo Create directory where we will make the image
 mkdir -p $HOME/LIVE_BOOT
 
 echo Install Debian
-debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://ftp.us.debian.org/debian/
-
+debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://archive.debian.org/debian/
 echo Copy supporting documents into the chroot
 cp -v /supportFiles/installChroot.sh $HOME/LIVE_BOOT/chroot/installChroot.sh
 cp -v /supportFiles/ddd $HOME/LIVE_BOOT/chroot/usr/bin/ddd
@@ -47,7 +59,6 @@ echo Create directories that will contain files for our live environment files a
 mkdir -p $HOME/LIVE_BOOT/{staging/{EFI/boot,boot/grub/x86_64-efi,isolinux,live},tmp}
 
 echo Compress the chroot environment into a Squash filesystem.
-sgdisk --move-second-header "/mnt/armbian.img"
 cp /mnt/armbian.img ${HOME}/LIVE_BOOT/chroot/mnt/
 ls ${HOME}/LIVE_BOOT/chroot/mnt/
 mksquashfs $HOME/LIVE_BOOT/chroot $HOME/LIVE_BOOT/staging/live/filesystem.squashfs -e boot

supportFiles/custom/build.sh

@@ -1,6 +1,21 @@
 #!/bin/bash
 # Based from https://willhaley.com/blog/custom-debian-live-environment/
 
+set -e
+
+echo "🔧 修复 buster 的源..."
+
+cat > /etc/apt/sources.list <<EOF
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main
+EOF
+
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until
+
+apt-get update
+
+echo "🚀 开始执行 build.sh ..."
+
 echo Install required tools
 apt-get update
 apt-get -y install debootstrap squashfs-tools xorriso isolinux syslinux-efi  grub-pc-bin grub-efi-amd64-bin mtools dosfstools parted
@@ -9,7 +24,7 @@ echo Create directory where we will make the image
 mkdir -p $HOME/LIVE_BOOT
 
 echo Install Debian
-debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://ftp.us.debian.org/debian/
+debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://archive.debian.org/debian/
 
 echo Copy supporting documents into the chroot
 cp -v /supportFiles/installChroot.sh $HOME/LIVE_BOOT/chroot/installChroot.sh

supportFiles/esirplayground/build.sh

@@ -1,6 +1,19 @@
 #!/bin/bash
 # Based from https://willhaley.com/blog/custom-debian-live-environment/
+set -e
 
+echo "🔧 修复 buster 的源..."
+
+cat > /etc/apt/sources.list <<EOF
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main
+EOF
+
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until
+
+apt-get update
+
+echo "🚀 开始执行 build.sh ..."
 echo Install required tools
 apt-get update
 apt-get -y install debootstrap squashfs-tools xorriso isolinux syslinux-efi  grub-pc-bin grub-efi-amd64-bin mtools dosfstools parted
@@ -9,7 +22,7 @@ echo Create directory where we will make the image
 mkdir -p $HOME/LIVE_BOOT
 
 echo Install Debian
-debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://ftp.us.debian.org/debian/
+debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://archive.debian.org/debian/
 
 echo Copy supporting documents into the chroot
 cp -v /supportFiles/installChroot.sh $HOME/LIVE_BOOT/chroot/installChroot.sh

supportFiles/ezopwrt/build.sh

@@ -1,6 +1,19 @@
 #!/bin/bash
 # Based from https://willhaley.com/blog/custom-debian-live-environment/
+set -e
 
+echo "🔧 修复 buster 的源..."
+
+cat > /etc/apt/sources.list <<EOF
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main
+EOF
+
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until
+
+apt-get update
+
+echo "🚀 开始执行 build.sh ..."
 echo Install required tools
 apt-get update
 apt-get -y install debootstrap squashfs-tools xorriso isolinux syslinux-efi  grub-pc-bin grub-efi-amd64-bin mtools dosfstools parted
@@ -9,8 +22,7 @@ echo Create directory where we will make the image
 mkdir -p $HOME/LIVE_BOOT
 
 echo Install Debian
-debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://ftp.us.debian.org/debian/
-
+debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://archive.debian.org/debian/
 echo Copy supporting documents into the chroot
 cp -v /supportFiles/installChroot.sh $HOME/LIVE_BOOT/chroot/installChroot.sh
 cp -v /supportFiles/ezopwrt/ddd $HOME/LIVE_BOOT/chroot/usr/bin/ddd

supportFiles/haos/build.sh

@@ -1,6 +1,19 @@
 #!/bin/bash
 # Based from https://willhaley.com/blog/custom-debian-live-environment/
+set -e
 
+echo "🔧 修复 buster 的源..."
+
+cat > /etc/apt/sources.list <<EOF
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main
+EOF
+
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until
+
+apt-get update
+
+echo "🚀 开始执行 build.sh ..."
 echo Install required tools
 apt-get update
 apt-get -y install debootstrap squashfs-tools xorriso isolinux syslinux-efi  grub-pc-bin grub-efi-amd64-bin mtools dosfstools parted
@@ -9,7 +22,7 @@ echo Create directory where we will make the image
 mkdir -p $HOME/LIVE_BOOT
 
 echo Install Debian
-debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://ftp.us.debian.org/debian/
+debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://archive.debian.org/debian/
 
 echo Copy supporting documents into the chroot
 cp -v /supportFiles/installChroot.sh $HOME/LIVE_BOOT/chroot/installChroot.sh

supportFiles/immortalwrt/build.sh

@@ -1,6 +1,21 @@
 #!/bin/bash
 # Based from https://willhaley.com/blog/custom-debian-live-environment/
 
+set -e
+
+echo "🔧 修复 buster 的源..."
+
+cat > /etc/apt/sources.list <<EOF
+deb http://archive.debian.org/debian buster main contrib non-free
+deb http://archive.debian.org/debian-security buster/updates main
+EOF
+
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until
+
+apt-get update
+
+echo "🚀 开始执行 build.sh ..."
+
 echo Install required tools
 apt-get update
 apt-get -y install debootstrap squashfs-tools xorriso isolinux syslinux-efi  grub-pc-bin grub-efi-amd64-bin mtools dosfstools parted
@@ -9,7 +24,7 @@ echo Create directory where we will make the image
 mkdir -p $HOME/LIVE_BOOT
 
 echo Install Debian
-debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://ftp.us.debian.org/debian/
+debootstrap --arch=amd64 --variant=minbase buster $HOME/LIVE_BOOT/chroot http://archive.debian.org/debian/
 
 echo Copy supporting documents into the chroot
 cp -v /supportFiles/installChroot.sh $HOME/LIVE_BOOT/chroot/installChroot.sh