Skip to content

Commit

Permalink
core: 引入 img_type_warp
Browse files Browse the repository at this point in the history
  • Loading branch information
@bin456789
bin456789 committed Sep 6, 2024
1 parent b9219cc commit 3364eb9
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 76 deletions.
107 changes: 65 additions & 42 deletions reinstall.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ test_url_grace() {
test_url_real() {
grace=$1
url=$2
expect_type=$3
expect_type_combo=$3
var_to_eval=$4
info test url

Expand All @@ -247,13 +247,14 @@ test_url_real() {

# TODO: 好像无法识别 nixos 官方源的跳转
# 有的服务器不支持 range，curl会下载整个文件
# 用 dd 限制下载 1M
# 并过滤 curl 23 错误（dd限制了空间）
# 所以用 head 限制 1M
# 过滤 curl 23 错误（head 限制了大小）
# 也可用 ulimit -f 但好像 cygwin 不支持
# ${PIPESTATUS[n]} 表示第n个管道的返回值
echo $url
for i in $(seq 5 -1 0); do
if command curl --insecure --connect-timeout 10 -Lfr 0-1048575 "$url" \
1> >(exec dd bs=1M count=1 of=$tmp_file iflag=fullblock 2>/dev/null) \
1> >(exec head -c 1048576 >$tmp_file) \
2> >(exec grep -v 'curl: (23)' >&2); then
break
else
Expand All @@ -268,19 +269,54 @@ test_url_real() {
fi
done

if [ -n "$expect_type" ]; then
# gzip的mime有很多种写法
# centos7中显示为 x-gzip，在其他系统中显示为 gzip，可能还有其他
# 所以不用mime判断
# https://www.digipres.org/formats/sources/tika/formats/#application/gzip
if [ -n "$expect_type_combo" ]; then
fix_file_type() {
# gzip的mime有很多种写法
# centos7中显示为 x-gzip，在其他系统中显示为 gzip，可能还有其他
# 所以不用mime判断
# https://www.digipres.org/formats/sources/tika/formats/#application/gzip

# 有些 file 版本输出的是 # ISO 9660 CD-ROM filesystem data ，要去掉开头的井号

# 下面两种都是 raw
# DOS/MBR boot sector
# x86 boot sector; partition 1: ...
sed 's/^# //' | cut -d' ' -f1 | to_lower |
sed -e 's,dos/mbr,raw,' -e 's,x86,raw,'
}

file_enhanced() {
file_type=$(file -b $tmp_file | fix_file_type)
if [ "$file_type" = "xz" ] || [ "$file_type" = "gzip" ]; then
# 要安装 xz 或者 gzip，不然会报错
# ERROR:[xz: Wait failed, No child process]
install_pkg "$file_type"

# 加 if 是为了避免以下情况（外面是xz，但是识别不到里面的东西，即使装了xz）,
# 即使 file 报错返回值也是 0
# [root@localhost ~]# file -bZ /reinstall-tmp/img-test
# ERROR:[xz: Unexpected end of input]
if file_type_in="$(file -bZ $tmp_file | fix_file_type)" &&
! grep -iq "^Error" <<<"$file_type_in"; then
file_type="$file_type_in.$file_type"
fi
fi
echo "$file_type"
}

# 有些 file 版本输出的是 # ISO 9660 CD-ROM filesystem data ，要去掉开头的井号
install_pkg file
real_type=$(file -b $tmp_file | sed 's/^# //' | cut -d' ' -f1 | to_lower)
[ -n "$var_to_eval" ] && eval $var_to_eval=$real_type
real_type_combo=$(file_enhanced $tmp_file)
echo "$real_type_combo"

if ! grep -Foq "|$real_type_combo|" <<<"|$expect_type_combo|"; then
failed "$url expected: $expect_type_combo. actual: $real_type_combo."
fi

IFS=. read -r real_type real_type_warp <<<"$real_type_combo"

if ! grep -wo "$real_type" <<<"$expect_type"; then
failed "$url expected: $expect_type. actual: $real_type."
if [ -n "$var_to_eval" ]; then
eval "$var_to_eval=$real_type"
eval "$var_to_eval""_warp=$real_type_warp"
fi
fi
}
Expand Down Expand Up @@ -934,7 +970,7 @@ setos() {
filename=$(curl -L $mirror | grep -oP "ubuntu-$releasever.*?-live-server-$basearch_alt.iso" | head -1)
iso=$mirror/$filename
# 在 ubuntu 20.04 上，file 命令检测 ubuntu 22.04 iso 结果是 DOS/MBR boot sector
test_url $iso 'iso|dos/mbr'
test_url $iso 'iso|raw'
eval ${step}_iso=$iso

# ks
Expand Down Expand Up @@ -985,7 +1021,7 @@ setos() {
# 传统安装
# 该服务器文件缓存 miss 时会响应 206 + Location 头
# 但 curl 这种情况不会重定向，所以添加 ascii 类型让它不要报错
test_url $mirror/nixos-$releasever/store-paths.xz xz/ascii
test_url $mirror/nixos-$releasever/store-paths.xz 'xz|ascii'
eval ${step}_mirror=$mirror
fi
}
Expand Down Expand Up @@ -1061,38 +1097,30 @@ setos() {
# 注意 windows server 2008 r2 serverdatacenter 不用改
image_name=${image_name/windows server 2008 server/windows longhorn server}

test_url $iso 'iso|dos/mbr'
test_url $iso 'iso|raw'
eval "${step}_iso='$iso'"
eval "${step}_image_name='$image_name'"
}

# shellcheck disable=SC2154
setos_dd() {
# 下面两种都是 raw
# DOS/MBR boot sector
# x86 boot sector; partition 1: ...
test_url $img 'xz|gzip|dos/mbr|x86' img_type

# 修正 raw 的 img_type
if [ "$img_type" = dos/mbr ] || [ "$img_type" = x86 ]; then
img_type=raw
fi
# raw 包含 vhd
test_url $img 'raw|raw.gzip|raw.xz' img_type

if is_efi; then
install_pkg hexdump

if ! [ "$img_type" = raw ]; then
install_pkg $img_type
fi

extract() {
if [ "$img_type" = raw ]; then
cat "$1"
else
case "$img_type_warp" in
'') cat "$1" ;;
xz | gzip)
install_pkg $img_type_warp
# xz/gzip -d 文件必须有正确的扩展名，否则报扩展名错误
# 因此用 stdin
$img_type -dc <"$1"
fi
"$img_type_warp" -dc <"$1"
;;
*) error_and_exit "warp type $img_type_warp not support." ;;
esac
}

# openwrt 镜像 efi part type 不是 esp
Expand Down Expand Up @@ -1126,6 +1154,7 @@ Continue with DD?
fi
eval "${step}_img='$img'"
eval "${step}_img_type='$img_type'"
eval "${step}_img_type_warp='$img_type_warp'"
}

setos_centos_alma_rocky_fedora() {
Expand Down Expand Up @@ -1293,13 +1322,7 @@ Continue with DD?
# 集中测试云镜像格式
if is_use_cloud_image && [ "$step" = finalos ]; then
# shellcheck disable=SC2154
test_url $finalos_img 'xz|gzip|qemu' finalos_img_type

# openeuler 云镜像格式是 .qcow2.xz
if [ "$distro" = openeuler ]; then
# shellcheck disable=SC2034
finalos_img_type=qemu
fi
test_url $finalos_img 'qemu|qemu.gzip|qemu.xz' finalos_img_type
fi
}

Expand Down
58 changes: 24 additions & 34 deletions trans.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1649,39 +1649,26 @@ get_http_file_size_to() {
var_name=$1
url=$2

size=''
if wget --spider -S $url -o /tmp/headers.log; then
# 网址重定向可能得到多个 Content-Length, 选最后一个
if size=$(grep 'Content-Length:' /tmp/headers.log |
tail -1 | awk '{print $2}' | grep .); then
eval "$var_name='$size'"
fi
pipe_extract() {
# alpine busybox 自带 gzip，但官方版也许性能更好
case "$img_type_warp" in
xz | gzip) apk add $img_type_warp ;;
'') ;;
*) error_and_exit "Not supported img_type_warp: $img_type_warp" ;;
esac

if [ -n "$img_type_warp" ]; then
"$img_type_warp" -dc
else
error_and_exit "Can't access $url"
cat
fi
}

dd_gzip_xz_raw() {
# 用官方 wget，一来带进度条，二来自带重试
# alpine busybox 自带 gzip xz，但官方版也许性能更好
# raw 包括 vhd
# shellcheck disable=SC2154
case "$img_type" in
xz | gzip) apk add wget $img_type ;;
raw) apk add wget ;;
*) error_and_exit 'Not supported' ;;
esac
# 用官方 wget，一来带进度条，二来自带重试功能
apk add wget

pipe_extract() {
if [ "$img_type" = raw ]; then
cat
else
$img_type -dc
fi
}

if ! command wget $img -O- --tries=5 --progress=bar:force |
pipe_extract >/dev/$xda 2>/tmp/dd_stderr; then
if ! wget $img -O- | pipe_extract >/dev/$xda 2>/tmp/dd_stderr; then
# vhd 文件结尾有 512 字节额外信息，可以忽略
if grep -iq 'No space' /tmp/dd_stderr; then
apk add parted
Expand Down Expand Up @@ -2536,11 +2523,13 @@ download_qcow() {
mount /dev/disk/by-label/installer /installer

qcow_file=/installer/cloud_image.qcow2
if [ "$distro" = openeuler ]; then
prog=xz
apk add wget $prog
command wget $img -O- --tries=5 --progress=bar:force | $prog -dc >$qcow_file
if [ -n "$img_type_warp" ]; then
# 边下载边解压，单线程下载
# 用官方 wget ，带进度条
apk add wget
wget $img -O- | pipe_extract >$qcow_file
else
# 多线程下载
download "$img" "$qcow_file"
fi
}
Expand Down Expand Up @@ -4077,6 +4066,7 @@ trans() {
fi

# dd qemu 切换成云镜像模式，暂时没用到
# shellcheck disable=SC2154
if [ "$distro" = "dd" ] && [ "$img_type" = "qemu" ]; then
# 移到 reinstall.sh ?
distro=any
Expand Down Expand Up @@ -4105,16 +4095,16 @@ trans() {
;;
esac
;;
gzip | xz | raw)
# 暂时没用到 gzip xz 格式的云镜像
raw)
# 暂时没用到 raw 格式的云镜像
dd_gzip_xz_raw
resize_after_install_cloud_image
modify_os_on_disk linux
;;
esac
elif [ "$distro" = "dd" ]; then
case "$img_type" in
gzip | xz | raw)
raw)
dd_gzip_xz_raw
modify_os_on_disk windows
;;
Expand Down

0 comments on commit 3364eb9

Please sign in to comment.