From 373d9cfc1b72d7308ace7adb300f5e8f01878ff7 Mon Sep 17 00:00:00 2001 From: Saverio Miroddi Date: Mon, 14 Jun 2021 17:17:23 +0200 Subject: [PATCH] Revert "Disable Ubuntu Server on mainline, and update README accordingly" This reverts commit 4d18dc14a6b63fdcd9870e33deac8ddfe230ef3d. --- README.md | 4 ++-- install-zfs.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index edb79d2..b4e297d 100644 --- a/README.md +++ b/README.md @@ -74,10 +74,10 @@ then follow the instructions; halfway through the procedure, the GUI installer o ### Ubuntu Server -Ubuntu Server requires a slightly different execution procedure, and the version 0.3.x of the script (the [new procedure](https://openzfs.github.io/openzfs-docs/Getting%20Started/Ubuntu/Ubuntu%2020.04%20Root%20on%20ZFS.html) doesn't directly support Ubuntu Server): +Ubuntu Server requires a slightly different execution procedure: - when the installer welcome screen shows up, tap `Ctrl+Alt+F2`, -- then type `curl -L https://git.io/JGjA6 | sudo bash`. +- then type `curl -L https://git.io/JelI5 | sudo bash`. then follow the instructions. diff --git a/install-zfs.sh b/install-zfs.sh index 0f2ebad..475583e 100755 --- a/install-zfs.sh +++ b/install-zfs.sh @@ -118,7 +118,7 @@ USERDATA/%P mountpoint=/home/%P canmount=on com.ubuntu.zsys:b ' c_zfs_mount_dir=/mnt c_installed_os_mount_dir=/target -declare -A c_supported_linux_distributions=([Ubuntu]="18.04 20.04" [LinuxMint]="19.1 19.2 19.3" [Linuxmint]="20 20.1" [elementary]=5.1) +declare -A c_supported_linux_distributions=([Ubuntu]="18.04 20.04" [UbuntuServer]="18.04 20.04" [LinuxMint]="19.1 19.2 19.3" [Linuxmint]="20 20.1" [elementary]=5.1) c_temporary_volume_size=12 # gigabytes; large enough - Debian, for example, takes ~8 GiB. c_passphrase_named_pipe=$(dirname "$(mktemp)")/zfs-installer.pp.fifo