fix: 修改lan口ip脚本复制到构建后, 再经行修改
This commit is contained in:
+9
-9
@@ -99,15 +99,6 @@ build() {
|
|||||||
|
|
||||||
mkdir -p "$FILES_DIR"
|
mkdir -p "$FILES_DIR"
|
||||||
|
|
||||||
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
|
||||||
LAN_SETTING_FILE="${SCRIPT_DIR}/files/etc/uci-defaults/98-network-setting"
|
|
||||||
if [ -e "$LAN_SETTING_FILE" ]; then
|
|
||||||
# 根据用户输入的 LAN_IP 修改默认 IP
|
|
||||||
sed -i \
|
|
||||||
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
|
||||||
"$LAN_SETTING_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# =============================================================
|
# =============================================================
|
||||||
# 复制自定义 files 目录(如果存在)
|
# 复制自定义 files 目录(如果存在)
|
||||||
# =============================================================
|
# =============================================================
|
||||||
@@ -115,6 +106,15 @@ build() {
|
|||||||
cp -rf "${SCRIPT_DIR}/files/." "$BUILDER_DIR/files/"
|
cp -rf "${SCRIPT_DIR}/files/." "$BUILDER_DIR/files/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
||||||
|
LAN_SETTING_FILE="${BUILDER_DIR}/files/etc/uci-defaults/98-network-setting"
|
||||||
|
if [ -e "$LAN_SETTING_FILE" ]; then
|
||||||
|
# 根据用户输入的 LAN_IP 修改默认 IP
|
||||||
|
sed -i \
|
||||||
|
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
||||||
|
"$LAN_SETTING_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# =============================================================
|
# =============================================================
|
||||||
# 校验 ImageBuilder 环境
|
# 校验 ImageBuilder 环境
|
||||||
|
|||||||
+9
-8
@@ -101,14 +101,6 @@ build() {
|
|||||||
|
|
||||||
mkdir -p "$FILES_DIR"
|
mkdir -p "$FILES_DIR"
|
||||||
|
|
||||||
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
|
||||||
LAN_SETTING_FILE="${SCRIPT_DIR}/files/etc/uci-defaults/98-network-setting"
|
|
||||||
if [ -e "$LAN_SETTING_FILE" ]; then
|
|
||||||
# 根据用户输入的 LAN_IP 修改默认 IP
|
|
||||||
sed -i \
|
|
||||||
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
|
||||||
"$LAN_SETTING_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# =============================================================
|
# =============================================================
|
||||||
# 复制自定义 files 目录(如果存在)
|
# 复制自定义 files 目录(如果存在)
|
||||||
@@ -117,6 +109,15 @@ build() {
|
|||||||
cp -rf "${SCRIPT_DIR}/files/." "$BUILDER_DIR/files/"
|
cp -rf "${SCRIPT_DIR}/files/." "$BUILDER_DIR/files/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
||||||
|
LAN_SETTING_FILE="${BUILDER_DIR}/files/etc/uci-defaults/98-network-setting"
|
||||||
|
if [ -e "$LAN_SETTING_FILE" ]; then
|
||||||
|
# 根据用户输入的 LAN_IP 修改默认 IP
|
||||||
|
sed -i \
|
||||||
|
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
||||||
|
"$LAN_SETTING_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
# =============================================================
|
# =============================================================
|
||||||
# 校验 ImageBuilder 环境
|
# 校验 ImageBuilder 环境
|
||||||
# =============================================================
|
# =============================================================
|
||||||
|
|||||||
@@ -129,24 +129,22 @@ build(){
|
|||||||
|
|
||||||
cd "$BUILDER_DIR"
|
cd "$BUILDER_DIR"
|
||||||
|
|
||||||
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
|
||||||
LAN_SETTING_FILE="${SCRIPT_DIR}/files/etc/uci-defaults/98-network-setting"
|
|
||||||
if [ -e "$LAN_SETTING_FILE" ]; then
|
|
||||||
# 根据用户输入的 LAN_IP 修改默认 IP
|
|
||||||
sed -i \
|
|
||||||
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
|
||||||
"$LAN_SETTING_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "$FILES_DIR"
|
mkdir -p "$FILES_DIR"
|
||||||
# 复制 files 目录下的自定义文件到 Image Builder 的 files 目录
|
# 复制 files 目录下的自定义文件到 Image Builder 的 files 目录
|
||||||
if [ -d "${SCRIPT_DIR}/files" ]; then
|
if [ -d "${SCRIPT_DIR}/files" ]; then
|
||||||
echo -e "${YELLOW}[提示] 复制自定义 files/ 目录到 Image Builder${NC}"
|
echo -e "${YELLOW}[提示] 复制自定义 files/ 目录到 Image Builder${NC}"
|
||||||
cp ${SCRIPT_DIR}/files/* $BUILDER_DIR/files/ -rf
|
cp ${SCRIPT_DIR}/files/* $BUILDER_DIR/files/ -rf
|
||||||
else
|
|
||||||
echo -e "${YELLOW}[提示] 未找到自定义 files/ 目录,跳过复制${NC}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
||||||
|
LAN_SETTING_FILE="${BUILDER_DIR}/files/etc/uci-defaults/98-network-setting"
|
||||||
|
if [ -e "$LAN_SETTING_FILE" ]; then
|
||||||
|
# 根据用户输入的 LAN_IP 修改默认 IP
|
||||||
|
sed -i \
|
||||||
|
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
||||||
|
"$LAN_SETTING_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -f "Makefile" ]; then
|
if [ ! -f "Makefile" ]; then
|
||||||
echo -e "${RED}[错误] 未找到 Makefile,请在 imagebuilder 根目录下运行本脚本!${NC}"
|
echo -e "${RED}[错误] 未找到 Makefile,请在 imagebuilder 根目录下运行本脚本!${NC}"
|
||||||
|
|||||||
@@ -143,14 +143,6 @@ build(){
|
|||||||
mkdir -p "$FILES_DIR"
|
mkdir -p "$FILES_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
|
||||||
LAN_SETTING_FILE="${SCRIPT_DIR}/files/etc/uci-defaults/98-network-setting"
|
|
||||||
if [ -e "$LAN_SETTING_FILE" ]; then
|
|
||||||
# 根据用户输入的 LAN_IP 修改默认 IP
|
|
||||||
sed -i \
|
|
||||||
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
|
||||||
"$LAN_SETTING_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 复制 files 目录下的自定义文件到 Image Builder 的 files 目录
|
# 复制 files 目录下的自定义文件到 Image Builder 的 files 目录
|
||||||
if [ -d "${SCRIPT_DIR}/files" ]; then
|
if [ -d "${SCRIPT_DIR}/files" ]; then
|
||||||
@@ -160,6 +152,15 @@ build(){
|
|||||||
echo -e "${YELLOW}[提示] 未找到自定义 files/ 目录,跳过复制${NC}"
|
echo -e "${YELLOW}[提示] 未找到自定义 files/ 目录,跳过复制${NC}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# 如果存在 LAN IP 设置脚本,则修改默认 LAN 地址
|
||||||
|
LAN_SETTING_FILE="${BUILDER_DIR}/files/etc/uci-defaults/98-network-setting"
|
||||||
|
if [ -e "$LAN_SETTING_FILE" ]; then
|
||||||
|
# 根据用户输入的 LAN_IP 修改默认 IP
|
||||||
|
sed -i \
|
||||||
|
"s/^update_lan_ip .*/update_lan_ip ${LAN_IP}/" \
|
||||||
|
"$LAN_SETTING_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
# 修改.config文件, 不构建以下格式固件
|
# 修改.config文件, 不构建以下格式固件
|
||||||
sed -i \
|
sed -i \
|
||||||
-e 's/^CONFIG_ISO_IMAGES=y/# CONFIG_ISO_IMAGES is not set/' \
|
-e 's/^CONFIG_ISO_IMAGES=y/# CONFIG_ISO_IMAGES is not set/' \
|
||||||
|
|||||||
Reference in New Issue
Block a user