From cf72ba07a0e564a17e9913c8abff35bbfaa060e4 Mon Sep 17 00:00:00 2001 From: Saverio Miroddi Date: Mon, 14 Jun 2021 15:38:28 +0200 Subject: [PATCH] Revert "Remove official support for Debian" This reverts commit 89964d9bc2aed8f4cf3f4040c01b20b8bf364cfe. --- README.md | 5 +++-- install-zfs.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b4e297d..f88e1c6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # zfs-installer -ZFS installer is a shell script program that fully prepares ZFS on a system, and allows an effortless installation of several Ubuntu-based operating systems using their standard installer (or debootstrap, or any custom script). +ZFS installer is a shell script program that fully prepares ZFS on a system, and allows an effortless installation of several Debian-based operating systems using their standard installer (or debootstrap, or any custom script). - [Status](#status) - [Requirements and functionality](#requirements-and-functionality) @@ -38,6 +38,7 @@ The program currently supports: - Ubuntu Desktop 18.04.x/20.04 Live - Ubuntu Server 18.04.x/20.04 Live - Linux Mint 19.x, 20 +- Debian 10.x Live (desktop environment required) - ElementaryOS 5.1 The ZFS version installed is 0.8 (optionally, 2.x), which supports native encryption and trimming (among the other improvements over 0.7). The required repositories are automatically added to the destination system. @@ -46,7 +47,7 @@ EFI boot is required (any modern (2011+) system will do); legacy boot is current All the ZFS RAID types are supported, with any arbitrary number of disks. An EFI partition is created on each disk, for redundancy purposes. -It's fairly easy to extend the program to support other Ubuntu-based operating systems - the project is open to feature requests. +It's fairly easy to extend the program to support other Debian-based operating systems (e.g. older/newer Ubuntu's, etc.) - the project is (very) open to feature requests. ## Comparison with Ubuntu built-in installer diff --git a/install-zfs.sh b/install-zfs.sh index cf91c3e..03c69f9 100755 --- a/install-zfs.sh +++ b/install-zfs.sh @@ -33,7 +33,7 @@ v_free_tail_space= # integer # Variables set during execution -v_linux_distribution= # Ubuntu, LinuxMint, ... WATCH OUT: not necessarily from `lsb_release` (ie. UbuntuServer) +v_linux_distribution= # Debian, Ubuntu, ... WATCH OUT: not necessarily from `lsb_release` (ie. UbuntuServer) v_use_ppa= # 1=true, false otherwise (applies only to Ubuntu-based). v_temp_volume_device= # /dev/zdN; scope: setup_partitions -> sync_os_temp_installation_dir_to_rpool v_suitable_disks=() # (/dev/by-id/disk_id, ...); scope: find_suitable_disks -> select_disk @@ -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" [UbuntuServer]="18.04 20.04" [LinuxMint]="19.1 19.2 19.3" [Linuxmint]="20 20.1" [elementary]=5.1) +declare -A c_supported_linux_distributions=([Debian]=10 [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