diff --git a/README.en.md b/README.en.md index c8a7cfc..579e215 100644 --- a/README.en.md +++ b/README.en.md @@ -150,14 +150,15 @@ bash reinstall.sh anolis 7|8|23 #### Optional Parameters - `--password PASSWORD` Set the password -- `--ssh-key KEY` Set up SSH public key, supports these formats. When using public key, password is empty. +- `--ssh-key KEY` Set up SSH login public key, supports these formats. When using public key, password is empty. - `--ssh-key "ssh-rsa ..."` - `--ssh-key "ssh-ed25519 ..."` - `--ssh-key "ecdsa-sha2-nistp256/384/521 ..."` - - `--ssh-key http://url` + - `--ssh-key http://path/to/public_key` - `--ssh-key github:your_username` - `--ssh-key gitlab:your_username` - `--ssh-key /path/to/public_key` + - `--ssh-key C:\path\to\public_key` - `--ssh-port PORT` Change the SSH port (for log observation during installation and for the new system) - `--web-port PORT` Change the Web port (for log observation during installation) - `--hold 2` Prevent reboot after installation completes, allowing SSH login to modify system content; the system is mounted at `/os` (this feature is not supported on Debian/Kali). @@ -236,14 +237,15 @@ bash reinstall.sh alpine --hold=1 - `--password PASSWORD` Set password - `--ssh-port PORT` Change SSH port -- `--ssh-key KEY` Set up SSH public key, supports these formats. When using public key, password is empty. - - `--ssh-key ssh-rsa ...` - - `--ssh-key ssh-ed25519 ...` - - `--ssh-key ecdsa-sha2-nistp256/384/521 ...` - - `--ssh-key http://url` +- `--ssh-key KEY` Set up SSH login public key, supports these formats. When using public key, password is empty. + - `--ssh-key "ssh-rsa ..."` + - `--ssh-key "ssh-ed25519 ..."` + - `--ssh-key "ecdsa-sha2-nistp256/384/521 ..."` + - `--ssh-key http://path/to/public_key` - `--ssh-key github:your_username` - `--ssh-key gitlab:your_username` - `--ssh-key /path/to/public_key` + - `--ssh-key C:\path\to\public_key` ### Feature 4: Reboot to netboot.xyz @@ -395,7 +397,7 @@ bash reinstall.sh windows \ #### The following drivers will automatic download and install as needed, without the need for manual addition - Virtio ([Virtio](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/), [Alibaba Cloud](https://www.alibabacloud.com/help/ecs/user-guide/install-the-virtio-driver-1)) -- XEN ([~~XEN~~(unsigned)](https://xenproject.org/resources/downloads/), [Citrix](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade), [AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/xen-drivers-overview.html)) +- XEN ([~~XEN~~ (unsigned)](https://xenproject.org/resources/downloads/), [Citrix](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade), [AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/xen-drivers-overview.html)) - AWS ([ENA Network Adapter](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ena-driver-releases-windows.html), [NVMe Storage Controller](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-driver-version-history.html)) - GCP ([gVNIC Network Adapter](https://cloud.google.com/compute/docs/networking/using-gvnic), [GGA Display Adapter](https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display)) - Azure ([MANA Network Adapter](https://learn.microsoft.com/azure/virtual-network/accelerated-networking-mana-windows)) diff --git a/README.md b/README.md index c7d4e25..90733c3 100644 --- a/README.md +++ b/README.md @@ -150,14 +150,15 @@ bash reinstall.sh anolis 7|8|23 #### 可选参数 - `--password PASSWORD` 设置密码 -- `--ssh-key KEY` 设置 SSH 公钥登录,支持以下格式。当使用公钥时,密码为空 +- `--ssh-key KEY` 设置 SSH 登录公钥,支持以下格式。当使用公钥时,密码为空 - `--ssh-key "ssh-rsa ..."` - `--ssh-key "ssh-ed25519 ..."` - `--ssh-key "ecdsa-sha2-nistp256/384/521 ..."` - - `--ssh-key http://url` + - `--ssh-key http://path/to/public_key` - `--ssh-key github:your_username` - `--ssh-key gitlab:your_username` - `--ssh-key /path/to/public_key` + - `--ssh-key C:\path\to\public_key` - `--ssh-port PORT` 修改 SSH 端口(安装期间观察日志用,也作用于新系统) - `--web-port PORT` 修改 Web 端口(安装期间观察日志用) - `--hold 2` 安装结束后不重启,此时可以 SSH 登录修改系统内容,系统挂载在 `/os` (此功能不支持 Debian/Kali) @@ -236,14 +237,15 @@ bash reinstall.sh alpine --hold=1 - `--password PASSWORD` 设置密码 - `--ssh-port PORT` 修改 SSH 端口 -- `--ssh-key KEY` 设置 SSH 公钥登录,支持以下格式。当使用公钥时,密码为空 - - `--ssh-key ssh-rsa ...` - - `--ssh-key ssh-ed25519 ...` - - `--ssh-key ecdsa-sha2-nistp256/384/521 ...` - - `--ssh-key http://url` +- `--ssh-key KEY` 设置 SSH 登录公钥,支持以下格式。当使用公钥时,密码为空 + - `--ssh-key "ssh-rsa ..."` + - `--ssh-key "ssh-ed25519 ..."` + - `--ssh-key "ecdsa-sha2-nistp256/384/521 ..."` + - `--ssh-key http://path/to/public_key` - `--ssh-key github:your_username` - `--ssh-key gitlab:your_username` - `--ssh-key /path/to/public_key` + - `--ssh-key C:\path\to\public_key` ### 功能 4: 重启到 netboot.xyz @@ -395,7 +397,7 @@ bash reinstall.sh windows \ #### 以下驱动会自动按需下载安装,无需手动添加 - Virtio ([Virtio](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/)、[阿里云](https://www.alibabacloud.com/help/ecs/user-guide/install-the-virtio-driver-1)) -- XEN ([~~XEN~~(未签名)](https://xenproject.org/resources/downloads/)、[Citrix](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade)、[AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/xen-drivers-overview.html)) +- XEN ([~~XEN~~ (未签名)](https://xenproject.org/resources/downloads/)、[Citrix](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Upgrading_PV_drivers.html#win2008-citrix-upgrade)、[AWS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/xen-drivers-overview.html)) - AWS ([ENA 网卡](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ena-driver-releases-windows.html)、[NVME 存储控制器](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-driver-version-history.html)) - GCP ([gVNIC 网卡](https://cloud.google.com/compute/docs/networking/using-gvnic)、[GGA 显卡](https://cloud.google.com/compute/docs/instances/enable-instance-virtual-display)) - Azure ([MANA 网卡](https://learn.microsoft.com/azure/virtual-network/accelerated-networking-mana-windows)) diff --git a/reinstall.sh b/reinstall.sh index db7ee35..702a3c3 100644 --- a/reinstall.sh +++ b/reinstall.sh @@ -3721,9 +3721,10 @@ Available options: --ssh-key "ecdsa-sha2-nistp256/384/521 ..." --ssh-key github:your_username --ssh-key gitlab:your_username - --ssh-key http://url - --ssh-key https://url + --ssh-key http://path/to/public_key + --ssh-key https://path/to/public_key --ssh-key /path/to/public_key + --ssh-key C:\path\to\public_key EOF exit 1 } diff --git a/trans.sh b/trans.sh index f532061..a9c772e 100644 --- a/trans.sh +++ b/trans.sh @@ -5496,11 +5496,10 @@ install_windows() { download "$(get_aws_repo)/AWSPV/$aws_pv_ver/AWSPVDriver.zip" $drv/AWSPVDriver.zip unzip -o -d $drv $drv/AWSPVDriver.zip - msiextract $drv/AWSPVDriverSetup.msi -C $drv - mkdir -p $drv/aws/ - cp -rf $drv/.Drivers/* $drv/aws/ + mkdir -p $drv/xen/ + msiextract $drv/AWSPVDriverSetup.msi -C $drv/xen/ - cp_drivers $drv/xen -ipath "*/$arch_xdd/*" + cp_drivers $drv/xen/.Drivers } # citrix xen @@ -5531,7 +5530,7 @@ install_windows() { tar -xf $drv/$part.tar -C $drv/xen/ done - cp_drivers $drv/xen + cp_drivers $drv/xen -ipath "*/$arch_xdd/*" } # virtio