From 1d5c0a3faae23b874ede16a92354f3d31f3f0eff Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko <9478806+andrey42@users.noreply.github.com> Date: Thu, 15 Oct 2020 16:15:19 +0200 Subject: [PATCH 1/3] updated repo name --- hetzner-debian10-zfs-setup.sh | 6 +++--- hetzner-ubuntu18-zfs-setup.sh | 6 +++--- virtualbox-debian10-zfs-setup.sh | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh index 06a74b3..c5956ac 100644 --- a/hetzner-debian10-zfs-setup.sh +++ b/hetzner-debian10-zfs-setup.sh @@ -208,7 +208,7 @@ LOG if [[ ${#v_suitable_disks[@]} -eq 0 ]]; then local dialog_message='No suitable disks have been found! -If you think this is a bug, please open an issue on https://github.com/andrey42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`. +If you think this is a bug, please open an issue on https://github.com/terem42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`. ' dialog --ascii-lines --msgbox "$dialog_message" 30 100 @@ -699,8 +699,8 @@ chroot_execute "apt install --yes man wget curl software-properties-common nano echo "======= installing zfs packages ==========" if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "wget -O - https://andrey42.github.io/zfs-debian/apt_pub.gpg | apt-key add -" - chroot_execute "add-apt-repository 'deb https://andrey42.github.io/zfs-debian/public zfs-debian-experimental main'" + chroot_execute "wget -O - https://terem42.github.io/zfs-debian/apt_pub.gpg | apt-key add -" + chroot_execute "add-apt-repository 'deb https://terem42.github.io/zfs-debian/public zfs-debian-experimental main'" chroot_execute "apt update" else chroot_execute "apt install --yes zfs-initramfs zfs-dkms" diff --git a/hetzner-ubuntu18-zfs-setup.sh b/hetzner-ubuntu18-zfs-setup.sh index d77f284..8acada6 100644 --- a/hetzner-ubuntu18-zfs-setup.sh +++ b/hetzner-ubuntu18-zfs-setup.sh @@ -173,7 +173,7 @@ LOG if [[ ${#v_suitable_disks[@]} -eq 0 ]]; then local dialog_message='No suitable disks have been found! -If you think this is a bug, please open an issue on https://github.com/andrey42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`. +If you think this is a bug, please open an issue on https://github.com/terem42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`. ' dialog --ascii-lines --msgbox "$dialog_message" 30 100 @@ -682,8 +682,8 @@ chroot_execute "systemctl disable thermald" echo "======= installing zfs packages ==========" if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "wget -O - https://andrey42.github.io/zfs-debian/apt_pub.gpg | apt-key add -" - chroot_execute "add-apt-repository 'deb https://andrey42.github.io/zfs-debian/public zfs-debian-experimental main'" + chroot_execute "wget -O - https://terem42.github.io/zfs-debian/apt_pub.gpg | apt-key add -" + chroot_execute "add-apt-repository 'deb https://terem42.github.io/zfs-debian/public zfs-debian-experimental main'" chroot_execute "apt update" else chroot_execute "add-apt-repository --yes ppa:jonathonf/zfs" diff --git a/virtualbox-debian10-zfs-setup.sh b/virtualbox-debian10-zfs-setup.sh index e492a34..4643cad 100644 --- a/virtualbox-debian10-zfs-setup.sh +++ b/virtualbox-debian10-zfs-setup.sh @@ -208,7 +208,7 @@ LOG if [[ ${#v_suitable_disks[@]} -eq 0 ]]; then local dialog_message='No suitable disks have been found! -If you think this is a bug, please open an issue on https://github.com/andrey42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`. +If you think this is a bug, please open an issue on https://github.com/terem42/zfs-hetzner-vm/issues, and attach the file `'"$c_disks_log"'`. ' dialog --ascii-lines --msgbox "$dialog_message" 30 100 @@ -710,8 +710,8 @@ chroot_execute "apt install --yes man wget curl software-properties-common nano echo "======= installing zfs packages ==========" if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "wget -O - https://andrey42.github.io/zfs-debian/apt_pub.gpg | apt-key add -" - chroot_execute "add-apt-repository 'deb https://andrey42.github.io/zfs-debian/public zfs-debian-experimental main'" + chroot_execute "wget -O - https://terem42.github.io/zfs-debian/apt_pub.gpg | apt-key add -" + chroot_execute "add-apt-repository 'deb https://terem42.github.io/zfs-debian/public zfs-debian-experimental main'" chroot_execute "apt update" else chroot_execute "apt install --yes zfs-initramfs zfs-dkms" @@ -728,7 +728,7 @@ chroot_execute "apt install --yes openssh-server net-tools" echo "======= setup OpenSSH ==========" mkdir -p "$c_zfs_mount_dir/root/.ssh/" -wget https://raw.githubusercontent.com/andrey42/zfs-hetzner-vm/vmtest/authorized_keys -O "$c_zfs_mount_dir/root/.ssh/authorized_keys" +wget https://raw.githubusercontent.com/terem42/zfs-hetzner-vm/vmtest/authorized_keys -O "$c_zfs_mount_dir/root/.ssh/authorized_keys" #cp /root/.ssh/authorized_keys "$c_zfs_mount_dir/root/.ssh/authorized_keys" sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' "$c_zfs_mount_dir/etc/ssh/sshd_config" sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/g' "$c_zfs_mount_dir/etc/ssh/sshd_config" From 77b6069a4475e00f072d55ca0b7c5d4896593ec6 Mon Sep 17 00:00:00 2001 From: terem42 <9478806+terem42@users.noreply.github.com> Date: Thu, 15 Oct 2020 20:11:37 +0200 Subject: [PATCH 2/3] Update virtualbox-debian10-zfs-setup.sh --- virtualbox-debian10-zfs-setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/virtualbox-debian10-zfs-setup.sh b/virtualbox-debian10-zfs-setup.sh index 4643cad..2732bbe 100644 --- a/virtualbox-debian10-zfs-setup.sh +++ b/virtualbox-debian10-zfs-setup.sh @@ -652,7 +652,7 @@ CONF chroot_execute "apt update" echo "======= setting locale, console and language ==========" -chroot_execute "apt install --yes -qq locales debconf-i18n apt-utils" +chroot_execute "apt install --yes -qq locales debconf-i18n apt-utils keyboard-configuration console-setup" sed -i 's/# en_US.UTF-8/en_US.UTF-8/' "$c_zfs_mount_dir/etc/locale.gen" sed -i 's/# fr_FR.UTF-8/fr_FR.UTF-8/' "$c_zfs_mount_dir/etc/locale.gen" sed -i 's/# fr_FR.UTF-8/fr_FR.UTF-8/' "$c_zfs_mount_dir/etc/locale.gen" @@ -694,7 +694,6 @@ CONF' chroot_execute "dpkg-reconfigure locales -f noninteractive" echo -e "LC_ALL=en_US.UTF-8\nLANG=en_US.UTF-8\n" >> "$c_zfs_mount_dir/etc/environment" -chroot_execute "apt install -qq --yes keyboard-configuration console-setup" chroot_execute "dpkg-reconfigure keyboard-configuration -f noninteractive" chroot_execute "dpkg-reconfigure console-setup -f noninteractive" chroot_execute "setupcon" From 2bc53ff84fd6259899c4cdc9cef194b4a4af41ad Mon Sep 17 00:00:00 2001 From: terem42 <9478806+terem42@users.noreply.github.com> Date: Thu, 15 Oct 2020 23:48:47 +0200 Subject: [PATCH 3/3] Update virtualbox-debian10-zfs-setup.sh --- virtualbox-debian10-zfs-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtualbox-debian10-zfs-setup.sh b/virtualbox-debian10-zfs-setup.sh index 2732bbe..eb80489 100644 --- a/virtualbox-debian10-zfs-setup.sh +++ b/virtualbox-debian10-zfs-setup.sh @@ -718,9 +718,9 @@ fi chroot_execute 'echo "zfs-dkms zfs-dkms/note-incompatible-licenses note true" | debconf-set-selections' if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "apt install --yes zfs-initramfs zfs-dkms zfsutils-linux" + chroot_execute "apt install --yes -t zfs-debian-experimental zfs-initramfs zfs-dkms zfsutils-linux" else - chroot_execute "apt install -t zfs-debian-experimental --yes zfs-initramfs zfs-dkms zfsutils-linux" + chroot_execute "apt install --yes zfs-initramfs zfs-dkms zfsutils-linux" fi echo "======= installing OpenSSH and network tooling ==========" chroot_execute "apt install --yes openssh-server net-tools"