windows: 适配 massgrave 新镜像链接

- 支持 bios + gpt
- 支持 arm

reinstall.sh

@@ -1146,9 +1146,7 @@ get_windows_iso_link_inner() {
         regex=${regex// /_}
 
         echo "looking for: $regex" >&2
-        if line=$(grep -Ei "^$regex " "$tmp/win.list" | get_shortest_line_by_field 1 | grep .) &&
-            iso=$(awk '{print $2}' <<<"$line" | grep .); then
-            echo "Selected: $line" >&2
+        if iso=$(grep -Ei "^$regex " "$tmp/win.list" | get_shortest_line_by_field 1 | awk '{print $2}' | grep .); then
             return
         fi
     done

trans.sh

@@ -2431,7 +2431,7 @@ get_disk_logic_sector_size() {
 }
 
 is_4kn() {
-    [ "$(blockdev --getss "/dev/$xda")" = 4096 ]
+    [ "$(blockdev --getss "$1")" = 4096 ]
 }
 
 is_xda_gt_2t() {
@@ -4367,6 +4367,12 @@ install_fnos() {
     # 挂载 proc sys dev
     mount_pseudo_fs /os
 
+    # 更新 initrd，官方安装器也有这一步
+    # 理论上要设置 1777 权限，但飞牛官方安装器安装后不是
+    mkdir -p $os_dir/var/tmp
+    chmod 1777 $os_dir/var/tmp
+    chroot $os_dir update-initramfs -u
+
     # 更改密码
     if is_need_set_ssh_keys; then
         set_ssh_keys_and_del_password $os_dir
@@ -4380,31 +4386,6 @@ install_fnos() {
         chroot $os_dir systemctl enable ssh
     fi
 
-    # fstab
-    {
-        # /
-        uuid=$(lsblk /dev/$xda*2 -no UUID)
-        echo "$fstab_line_os" | sed "s/%s/$uuid/"
-
-        # swapfile
-        # 官方安装器即使 swapfile 设为 0 也会有这行
-        echo "$fstab_line_swapfile"
-
-        # /boot/efi
-        if is_efi; then
-            uuid=$(lsblk /dev/$xda*1 -no UUID)
-            echo "$fstab_line_efi" | sed "s/%s/$uuid/"
-        fi
-    } >$os_dir/etc/fstab
-
-    # 更新 initrd，官方安装器也有这一步
-    # 理论上 /var/tmp 要设置 1777 权限，但飞牛官方安装器安装后不是
-    # 需要先创建 /etc/fstab ，否则会有以下警告
-    # W: Couldn't identify type of root file system for fsck hook
-    mkdir -p $os_dir/var/tmp
-    chmod 1777 $os_dir/var/tmp
-    chroot $os_dir update-initramfs -u
-
     # grub
     if is_efi; then
         chroot $os_dir grub-install --efi-directory=/boot/efi
@@ -4423,6 +4404,23 @@ install_fnos() {
 
     chroot $os_dir update-grub
 
+    # fstab
+    {
+        # /
+        uuid=$(lsblk /dev/$xda*2 -no UUID)
+        echo "$fstab_line_os" | sed "s/%s/$uuid/"
+
+        # swapfile
+        # 官方安装器即使 swapfile 设为 0 也会有这行
+        echo "$fstab_line_swapfile"
+
+        # /boot/efi
+        if is_efi; then
+            uuid=$(lsblk /dev/$xda*1 -no UUID)
+            echo "$fstab_line_efi" | sed "s/%s/$uuid/"
+        fi
+    } >$os_dir/etc/fstab
+
     # 网卡配置
     create_cloud_init_network_config /net.cfg
     create_network_manager_config /net.cfg $os_dir
@@ -6837,7 +6835,7 @@ EOF
 
     # 4kn EFI 分区最少要 260M
     # https://learn.microsoft.com/windows-hardware/manufacture/desktop/hard-drives-and-partitions
-    if is_4kn; then
+    if is_4kn /dev/$xda; then
         sed -i 's/is4kn=0/is4kn=1/i' $startnet_cmd
     fi