From da162ed781958cc557ab14d4044f7517b78cdcc2 Mon Sep 17 00:00:00 2001 From: zj <1052308357@qq.com> Date: Sat, 29 Nov 2025 16:14:38 +0800 Subject: [PATCH] update --- .../airootfs/etc/xdg/reflector/reflector.conf | 1 + .../.config/autostart/first-start.desktop | 9 ---- archiso/airootfs/home/smart/first-start.sh | 41 ------------------- archiso/airootfs/usr/bin/change-servername_s2 | 14 ++++--- .../usr/local/bin/change-servername_s2 | 14 ++++--- archiso/packages.x86_64 | 8 +++- archiso/profiledef.sh | 2 +- 7 files changed, 26 insertions(+), 63 deletions(-) delete mode 100755 archiso/airootfs/home/smart/.config/autostart/first-start.desktop delete mode 100644 archiso/airootfs/home/smart/first-start.sh diff --git a/archiso/airootfs/etc/xdg/reflector/reflector.conf b/archiso/airootfs/etc/xdg/reflector/reflector.conf index 7c830d2d..209eb2c0 100755 --- a/archiso/airootfs/etc/xdg/reflector/reflector.conf +++ b/archiso/airootfs/etc/xdg/reflector/reflector.conf @@ -6,3 +6,4 @@ --protocol https --latest 20 --sort rate +--country China \ No newline at end of file diff --git a/archiso/airootfs/home/smart/.config/autostart/first-start.desktop b/archiso/airootfs/home/smart/.config/autostart/first-start.desktop deleted file mode 100755 index 62aa5321..00000000 --- a/archiso/airootfs/home/smart/.config/autostart/first-start.desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env xdg-open - -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=true -Name[zh_CN]=first-start -Exec=sudo sh /home/smart/first-start.sh -Name=first-start diff --git a/archiso/airootfs/home/smart/first-start.sh b/archiso/airootfs/home/smart/first-start.sh deleted file mode 100644 index 2de05e42..00000000 --- a/archiso/airootfs/home/smart/first-start.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - - -echo "--- 系统配置安装中 ---" -echo "--------------------" -echo "--- 修改TeamViewer 密码 ---" -teamviewer --passwd 'Bbt123!@#' | sed '/^\s*$/d' - -#主机名修改 -echo "--- 主机名修改 ---" -change-servername_s2 - -# SOS 服务 - -echo "--- SOS服务启动 ---" -/bin/bash /home/smart/smart-organizer-service-install.sh - -# 版本不同导致 参数名不同 将现在参数(--container-ratio)映射成之前参数(--content-ratio)或者修改程序 -echo "--- 修改dcp映射 ---" -mv /usr/bin/dcpomatic2_create /usr/bin/dcpomatic2_create_original -cp /home/smart/dcpomatic2_create /usr/bin/dcpomatic2_create -chmod 755 /usr/bin/dcpomatic2_create - -/bin/rm -rf /home/smart/.config/autostart/first-start.desktop - -/bin/rm -rf /home/smart/first-start.sh - -echo "--- 复制快捷方式 ---" -cp /home/smart/Desktop/*.desktop /usr/share/applications/ -cp /home/smart/*.desktop /usr/share/applications/ - -echo "--- pacman换源 ---" -mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak -mv /etc/pacman.d/mirrorlist~ /etc/pacman.d/mirrorlist - -echo "--- 配置完成,将在5秒后重启 ---" - -sleep 5 - -reboot - diff --git a/archiso/airootfs/usr/bin/change-servername_s2 b/archiso/airootfs/usr/bin/change-servername_s2 index 77081eee..9097593f 100755 --- a/archiso/airootfs/usr/bin/change-servername_s2 +++ b/archiso/airootfs/usr/bin/change-servername_s2 @@ -13,10 +13,14 @@ random_str() { echo "$str" } -# 生成随机主机名 -hostname=$(random_str) +NEW_HOSTNAME=$(random_str) -# 设置主机名 -hostnamectl set-hostname "$hostname" +echo "$NEW_HOSTNAME" > /etc/hostname -echo "主机名已设置为: $hostname" +cat < /etc/hosts +127.0.0.1 localhost +::1 localhost +127.0.1.1 $NEW_HOSTNAME +EOF + +echo "Hostname set to: $NEW_HOSTNAME" diff --git a/archiso/airootfs/usr/local/bin/change-servername_s2 b/archiso/airootfs/usr/local/bin/change-servername_s2 index 77081eee..9097593f 100755 --- a/archiso/airootfs/usr/local/bin/change-servername_s2 +++ b/archiso/airootfs/usr/local/bin/change-servername_s2 @@ -13,10 +13,14 @@ random_str() { echo "$str" } -# 生成随机主机名 -hostname=$(random_str) +NEW_HOSTNAME=$(random_str) -# 设置主机名 -hostnamectl set-hostname "$hostname" +echo "$NEW_HOSTNAME" > /etc/hostname -echo "主机名已设置为: $hostname" +cat < /etc/hosts +127.0.0.1 localhost +::1 localhost +127.0.1.1 $NEW_HOSTNAME +EOF + +echo "Hostname set to: $NEW_HOSTNAME" diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 2d219fb0..a8712d6f 100755 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -184,8 +184,11 @@ neofetch #virtualbox-guest-utils mesa +lib32-mesa +vulkan-intel +lib32-vulkan-intel #xf86-video-intel -xf86-video-amdgpu +#xf86-video-amdgpu #xf86-video-nouveau #nvidia @@ -237,7 +240,7 @@ xfce4-netload-plugin xfce4-places-plugin xfce4-screensaver xfce4-screenshooter -xfce4-taskmanager +#xfce4-taskmanager xfce4-time-out-plugin xfce4-timer-plugin xfce4-verve-plugin @@ -311,6 +314,7 @@ htop sysstat unhide gnome-disk-utility +gnome-system-monitor iftop nmap zip diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index 008ff879..d9772e70 100755 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -4,7 +4,7 @@ iso_name="BBTTMS" iso_label="BBTTMS_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" iso_publisher="BBTTMS " -iso_application="BBTTMS Arch Linux Live/Rescue DVD" +iso_application="BBTTMS Arch Linux Live/Rescue/Install DVD" iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" install_dir="BBTTMS" buildmodes=('iso')