core: 不重要的更新

This commit is contained in:
bin456789
2024-02-01 01:02:35 +08:00
parent db1b2c92ca
commit d9b53f1bf8
5 changed files with 24 additions and 23 deletions

View File

@ -1,4 +1,4 @@
# shellcheck disable=2148
# shellcheck disable=SC2148
# 设置
keyboard --vckeymap=us --xlayouts='us'
lang en_US.UTF-8
@ -41,7 +41,7 @@ releasever=$(awk -F: '{ print $5 }' </etc/system-release-cpe)
# 提取 extra.confhome extra.mirrorlist extra.main_disk
prefix=extra
for var in $(grep -o "\b$prefix\.[^ ]*" /proc/cmdline | xargs); do
eval "$(echo $var | sed -E "s/$prefix\.([^=]*)=(.*)/\1='\2'/")"
eval "$(echo "$var" | sed -E "s/$prefix\.([^=]*)=(.*)/\1='\2'/")"
done
get_all_disks() {
@ -69,7 +69,8 @@ echo "ignoredisk --only-use=$(get_xda)" >$include
# 设置 tty
include=/tmp/include-bootloader
console_cmdline=$(wget $confhome/ttys.sh -O- | sh -s console=)
# shellcheck disable=SC2154
console_cmdline=$(wget "$confhome/ttys.sh" -O- | sh -s console=)
echo "bootloader --append=\"$console_cmdline\"" >$include
# 有 installer 分区,表示用了两步安装
@ -79,7 +80,7 @@ if [ -e /dev/disk/by-label/installer ]; then
# 1g内存下安装器默认开启了zram 但安装f38还是不够内存
# 具体表现为不断重启安装界面所以还要开启swap
ram_size=$(lsmem -b 2>/dev/null | grep 'Total online memory:' | awk '{ print $NF/1024/1024 }')
if [ -z $ram_size ] || [ $ram_size -le 1024 ]; then
if [ -z "$ram_size" ] || [ "$ram_size" -le 1024 ]; then
mount /dev/disk/by-label/installer /run/install/repo -o remount,rw
swapfile=/run/install/repo/swapfile
if command -v fallocate; then
@ -169,11 +170,11 @@ if [ -e /dev/disk/by-label/installer ]; then
# 提取 extra.localtest extra.confhome extra.mirrorlist
prefix=extra
for var in $(grep -o "\b$prefix\.[^ ]*" /proc/cmdline | xargs); do
eval "$(echo $var | sed -E "s/$prefix\.([^=]*)=(.*)/\1='\2'/")"
eval "$(echo "$var" | sed -E "s/$prefix\.([^=]*)=(.*)/\1='\2'/")"
done
cd /
curl -O $confhome/resize.sh
curl -O "$confhome/resize.sh"
echo '@reboot root bash /resize.sh' >/etc/cron.d/resize
fi
%end