From 9fba62d731d46a942a72576657ce20cf8f4b8d5c Mon Sep 17 00:00:00 2001 From: Sven Göthel Date: Wed, 27 Nov 2024 08:54:16 +0100 Subject: rescue_zfs: Bump OpenZFS 2.1.6 -> 2.2.6 --- ...5-build-debian_deb12_amd64-ro-rescuezfs-jau.cfg | 2 +- .../files/root_zfs/setup/change_compression.sh | 17 ++++ .../files/root_zfs/setup/convert-mbr_to_uefi.txt | 29 ++++++ .../files/root_zfs/setup/copy_to_new_pool.sh | 30 ++++++ .../files/root_zfs/setup/export_import.sh | 7 ++ .../files/root_zfs/setup/new_blank_zpool.sh | 64 ++++++++++++ .../files/root_zfs/setup/new_disk.sh | 24 ----- .../files/root_zfs/setup/new_full_zpool.sh | 107 +++++++++++++++++++++ .../files/root_zfs/setup/new_gpt_efi_disk.sh | 37 +++++++ .../files/root_zfs/setup/new_gpt_mpr_disk.sh | 27 ++++++ .../files/root_zfs/setup/set_mountpoint.sh | 10 ++ .../files/root_zfs/setup/zfs-zap-disk.txt | 27 ++++++ .../files/root_zfs/zfs-install-debian11-amd64.sh | 35 ------- .../files/root_zfs/zfs-install-debian12-amd64.sh | 32 +++--- .../libnvpair3_2.1.6-1_amd64.deb | Bin 108572 -> 0 bytes .../libuutil3_2.1.6-1_amd64.deb | Bin 67176 -> 0 bytes .../libzfs5-devel_2.1.6-1_amd64.deb | Bin 312120 -> 0 bytes .../libzfs5_2.1.6-1_amd64.deb | Bin 661028 -> 0 bytes .../libzpool5_2.1.6-1_amd64.deb | Bin 5054460 -> 0 bytes .../python3-pyzfs_2.1.6-1_amd64.deb | Bin 100984 -> 0 bytes .../zfs-2.1.6.tar.gz | Bin 35070356 -> 0 bytes .../zfs-dkms_2.1.6-1_amd64.deb | Bin 30288880 -> 0 bytes .../zfs-dracut_2.1.6-1_amd64.deb | Bin 9900 -> 0 bytes .../zfs-initramfs_2.1.6-1_amd64.deb | Bin 12608 -> 0 bytes .../zfs-test_2.1.6-1_amd64.deb | Bin 26945016 -> 0 bytes .../zfs_2.1.6-1_amd64.deb | Bin 605072 -> 0 bytes .../libnvpair3_2.1.6-1_amd64.deb | Bin 31180 -> 0 bytes .../libuutil3_2.1.6-1_amd64.deb | Bin 24236 -> 0 bytes .../libzfs5-devel_2.1.6-1_amd64.deb | Bin 312104 -> 0 bytes .../libzfs5_2.1.6-1_amd64.deb | Bin 207900 -> 0 bytes .../libzpool5_2.1.6-1_amd64.deb | Bin 1280792 -> 0 bytes .../python3-pyzfs_2.1.6-1_amd64.deb | Bin 102156 -> 0 bytes .../zfs-2.1.6.tar.gz | Bin 35071771 -> 0 bytes .../zfs-dkms_2.1.6-1_amd64.deb | Bin 30295916 -> 0 bytes .../zfs-dracut_2.1.6-1_amd64.deb | Bin 9904 -> 0 bytes .../zfs-initramfs_2.1.6-1_amd64.deb | Bin 12616 -> 0 bytes .../zfs-test_2.1.6-1_amd64.deb | Bin 26938552 -> 0 bytes .../zfs_2.1.6-1_amd64.deb | Bin 605504 -> 0 bytes .../kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb | Bin 0 -> 1469768 bytes ...kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb | Bin 0 -> 22740 bytes .../kmod-zfs-devel_2.2.6-1_amd64.deb | Bin 0 -> 319188 bytes .../libnvpair3_2.2.6-1_amd64.deb | Bin 0 -> 31504 bytes .../libuutil3_2.2.6-1_amd64.deb | Bin 0 -> 22644 bytes .../libzfs5-devel_2.2.6-1_amd64.deb | Bin 0 -> 318320 bytes .../libzfs5_2.2.6-1_amd64.deb | Bin 0 -> 205856 bytes .../libzpool5_2.2.6-1_amd64.deb | Bin 0 -> 1339772 bytes .../pam-zfs-key_2.2.6-1_amd64.deb | Bin 0 -> 9628 bytes .../python3-pyzfs_2.2.6-1_amd64.deb | Bin 0 -> 138444 bytes .../zfs-2.2.6.tar.gz | Bin 0 -> 34038434 bytes .../zfs-dkms_2.2.6-1_amd64.deb | Bin 0 -> 31910220 bytes .../zfs-dracut_2.2.6-1_amd64.deb | Bin 0 -> 10088 bytes .../zfs-initramfs_2.2.6-1_amd64.deb | Bin 0 -> 13724 bytes .../zfs-test_2.2.6-1_amd64.deb | Bin 0 -> 28445140 bytes .../zfs_2.2.6-1_amd64.deb | Bin 0 -> 672736 bytes .../00-install-zfs/files/root_zfs/zfs-remove.sh | 4 +- 55 files changed, 376 insertions(+), 76 deletions(-) create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/change_compression.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/convert-mbr_to_uefi.txt create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/copy_to_new_pool.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/export_import.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_blank_zpool.sh delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_disk.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_full_zpool.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_efi_disk.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_mpr_disk.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/set_mountpoint.sh create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/setup/zfs-zap-disk.txt delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian11-amd64.sh delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libnvpair3_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libuutil3_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5-devel_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzpool5_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/python3-pyzfs_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-2.1.6.tar.gz delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dkms_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dracut_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-initramfs_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-test_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libnvpair3_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libuutil3_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5-devel_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzpool5_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/python3-pyzfs_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-2.1.6.tar.gz delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dkms_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dracut_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-initramfs_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-test_2.1.6-1_amd64.deb delete mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs_2.1.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libnvpair3_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libuutil3_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5-devel_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzpool5_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/pam-zfs-key_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/python3-pyzfs_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-2.2.6.tar.gz create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dkms_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dracut_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-initramfs_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-test_2.2.6-1_amd64.deb create mode 100644 stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs_2.2.6-1_amd64.deb diff --git a/scripts/05-build-debian_deb12_amd64-ro-rescuezfs-jau.cfg b/scripts/05-build-debian_deb12_amd64-ro-rescuezfs-jau.cfg index f807ab1..779276d 100644 --- a/scripts/05-build-debian_deb12_amd64-ro-rescuezfs-jau.cfg +++ b/scripts/05-build-debian_deb12_amd64-ro-rescuezfs-jau.cfg @@ -16,7 +16,7 @@ export DEB_SERVER="http://ftp.de.debian.org/debian" export APT_PROXY=http://jordan:3142 export CUSTOM_NAME="DebAmd64RescueZfs" -export CUSTOM_VERSION="1.3-ro" +export CUSTOM_VERSION="1.4-ro" export PI_GEN="pi-gen (zfs branch)" diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/change_compression.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/change_compression.sh new file mode 100644 index 0000000..b26252a --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/change_compression.sh @@ -0,0 +1,17 @@ +export POOL=tpool2 +export SNAPNAME=transfer + +export DSSRC=system/debian/var +export DSDST=system/debian/var2 + +export ZFS_COMPRESSION_METHOD=lz4 +#export ZFS_COMPRESSION_METHOD=zstd + +zfs create -o compression=${ZFS_COMPRESSION_METHOD} $POOL/$DSDST + +zfs snapshot $POOL/$DSSRC@$SNAPNAME +#zfs send $POOL/$DSSRC@$SNAPNAME | zfs receive -Fduv -o compression=${ZFS_COMPRESSION_METHOD} $POOL/$DSDST +zfs send $POOL/$DSSRC@$SNAPNAME | zfs receive -Fuv -o compression=${ZFS_COMPRESSION_METHOD} $POOL/$DSDST + +zfs destroy $POOL/$DSSRC@$SNAPNAME +zfs destroy $POOL/$DSDST@$SNAPNAME diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/convert-mbr_to_uefi.txt b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/convert-mbr_to_uefi.txt new file mode 100644 index 0000000..d4e8c3f --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/convert-mbr_to_uefi.txt @@ -0,0 +1,29 @@ +Setup /boot/efi vfat mount + 505 mkdir /boot/efi + 509 mount /dev/disk/by-id/ata-QEMU_HARDDISK_QM00007-part2 /boot/efi + 512 blkid /dev/disk/by-id/ata-QEMU_HARDDISK_QM00007-part2 + 511 vi /etc/fstab + # was /dev/disk/by-id/ata-QEMU_HARDDISK_QM00007-part2 + UUID=9F32-F032 /boot/efi vfat umask=0077 0 1 + 518 systemctl daemon-reload + 514 umount /boot/efi + 515 mount /boot/efi + +Install grub efi + 522 sudo apt install grub-efi-amd64 -y + 525 dpkg -P grub-pc grub-pc-bin + 533 rm -rf /boot/grub/i386-pc + check + - existing /etc/default/grub + - only /boot/efi/EFI/debian/ should exist + - rm -rf /boot/efi/EFI/GRUB (???) + - may need: `sudo apt reinstall grub-efi-amd64 -y` + + - Misc + - Not needed: `grub-install --target=x86_64-efi --bootloader-id=debian --efi-directory=/boot/efi` + - But could `sudo apt install --reinstall grub-efi-amd64` + 536 update-grub + 537 ls -la /boot/grub/ + +BIOS + - Disable Secure-Boot diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/copy_to_new_pool.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/copy_to_new_pool.sh new file mode 100644 index 0000000..6e2f45a --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/copy_to_new_pool.sh @@ -0,0 +1,30 @@ +export ROOTFS_DIR="/mnt" +export POOL1=tpool +export POOL2=tpool2 +export SNAPNAME=transfer + +zfs snapshot -r $POOL1@$SNAPNAME +zfs send -R $POOL1@$SNAPNAME | zfs receive -Fduv $POOL2 + +zfs destroy -r $POOL1@$SNAPNAME +zfs destroy -r $POOL2@$SNAPNAME + +# now re-import on $ROOTFS_DIR w/ mounting +zpool export $POOL2 +zpool import -R $ROOTFS_DIR $POOL + +# Maintenance +echo +echo "$POOL2 mountpoints" +zfs get -r mountpoint $POOL2 + +echo +echo "$POOL2 compression" +zfs get -r compression $POOL2 + +echo +echo "$POOL2 snapshots" +zfs list -r -t snapshot $POOL2 + +# follow +# - ../rescue/chroot_zfs.sh to update grub on new pool diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/export_import.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/export_import.sh new file mode 100644 index 0000000..8185228 --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/export_import.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +export POOL=tpool2 +export ROOTFS_DIR="/mnt" + +zpool export $POOL +zpool import -R $ROOTFS_DIR -N $POOL diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_blank_zpool.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_blank_zpool.sh new file mode 100644 index 0000000..e766243 --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_blank_zpool.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +DISK1=ata-QEMU_HARDDISK_QM00007 +DISK2=ata-QEMU_HARDDISK_QM00009 +DISK3=ata-QEMU_HARDDISK_QM00011 + +export ROOTFS_DIR="/mnt" + +export POOL=tpool2 +export ZFS_COMPRESSION_METHOD=lz4 +# export ZFS_COMPRESSION_METHOD=zstd + +# +# Manually enabled ZFS features for GRUB compatibility! +# See https://wiki.archlinux.org/title/ZFS#GRUB-compatible_pool_creation +# Tested w/ Grub 2.04-19 +# +zpool create -f -o ashift=12 -o autoexpand=on \ + -O atime=off -O compression=off \ + -O mountpoint=/ -R ${ROOTFS_DIR} \ + -d \ + -o compatibility=grub2_readonly \ + -o feature@async_destroy=enabled \ + -o feature@bookmarks=enabled \ + -o feature@embedded_data=enabled \ + -o feature@empty_bpobj=enabled \ + -o feature@enabled_txg=enabled \ + -o feature@extensible_dataset=enabled \ + -o feature@filesystem_limits=enabled \ + -o feature@hole_birth=enabled \ + -o feature@large_blocks=enabled \ + -o feature@lz4_compress=enabled \ + -o feature@spacemap_histogram=enabled \ + -o feature@allocation_classes=enabled \ + -o feature@device_rebuild=enabled \ + -o feature@livelist=enabled \ + -o feature@log_spacemap=enabled \ + -o feature@obsolete_counts=enabled \ + -o feature@project_quota=enabled \ + -o feature@resilver_defer=enabled \ + -o feature@spacemap_v2=enabled \ + -o feature@userobj_accounting=enabled \ + -o feature@zpool_checkpoint=enabled \ + \ + $POOL raidz1 \ + /dev/disk/by-id/$DISK1-part3 \ + /dev/disk/by-id/$DISK2-part3 \ + /dev/disk/by-id/$DISK3-part3 + +zpool autoexpand=on $POOL +zpool autoreplace=off $POOL +zpool listsnapshots=off $POOL + +zfs set dedup=off $POOL +zfs set compression=off $POOL +zfs set atime=off $POOL +zfs set mountpoint=none $POOL +zfs set aclinherit=passthrough $POOL +zfs set acltype=posixacl $POOL +zfs set xattr=sa $POOL + +# zpool export $POOL +# zpool import -R $ROOTFS_DIR -N $POOL + diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_disk.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_disk.sh deleted file mode 100644 index 820fc6c..0000000 --- a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_disk.sh +++ /dev/null @@ -1,24 +0,0 @@ - -NDISK1=ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0798JN -NDISK2=ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0791VU -NDISK3=ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA02K427 - -# Clear the partition table: -sgdisk --zap-all /dev/disk/by-id/$NDISK1 -#sgdisk --zap-all /dev/disk/by-id/$NDISK2 -#sgdisk --zap-all /dev/disk/by-id/$NDISK3 - -# 2.2 Partition your disk: -# -# Run this if you need legacy (BIOS) booting: -sgdisk -a1 -n1:40:2047 -t1:EF02 /dev/disk/by-id/$NDISK1 -#sgdisk -a1 -n1:40:2047 -t1:EF02 /dev/disk/by-id/$NDISK2 -#sgdisk -a1 -n1:40:2047 -t1:EF02 /dev/disk/by-id/$NDISK3 - -#Run these in all cases: -sgdisk -n2:0:0 -t2:BF01 /dev/disk/by-id/$NDISK1 -#sgdisk -n2:0:0 -t2:BF01 /dev/disk/by-id/$NDISK2 -#sgdisk -n2:0:0 -t2:BF01 /dev/disk/by-id/$NDISK3 - -echo "Now replace the disk .." -echo "zpool replace risa 12458555210078177352 /dev/disk/by-id/ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0798JN-part1" diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_full_zpool.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_full_zpool.sh new file mode 100644 index 0000000..8f2c87a --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_full_zpool.sh @@ -0,0 +1,107 @@ +#!/bin/bash + +DISK1=ata-QEMU_HARDDISK_QM00007 +DISK2=ata-QEMU_HARDDISK_QM00009 +DISK3=ata-QEMU_HARDDISK_QM00011 + +export ROOTFS_DIR="/mnt" +# export MYSWAPSIZE=64G +# export MYSWAPSIZE=1G + +export POOL=tpool2 +export ZFS_COMPRESSION_METHOD=lz4 +# export ZFS_COMPRESSION_METHOD=zstd + +# +# Manually enabled ZFS features for GRUB compatibility! +# See https://wiki.archlinux.org/title/ZFS#GRUB-compatible_pool_creation +# Tested w/ Grub 2.04-19 +# +zpool create -f -o ashift=12 -o autoexpand=on \ + -O atime=off -O compression=off \ + -O mountpoint=/ -R ${ROOTFS_DIR} \ + -d \ + -o compatibility=grub2_readonly \ + -o feature@async_destroy=enabled \ + -o feature@bookmarks=enabled \ + -o feature@embedded_data=enabled \ + -o feature@empty_bpobj=enabled \ + -o feature@enabled_txg=enabled \ + -o feature@extensible_dataset=enabled \ + -o feature@filesystem_limits=enabled \ + -o feature@hole_birth=enabled \ + -o feature@large_blocks=enabled \ + -o feature@lz4_compress=enabled \ + -o feature@spacemap_histogram=enabled \ + -o feature@allocation_classes=enabled \ + -o feature@device_rebuild=enabled \ + -o feature@livelist=enabled \ + -o feature@log_spacemap=enabled \ + -o feature@obsolete_counts=enabled \ + -o feature@project_quota=enabled \ + -o feature@resilver_defer=enabled \ + -o feature@spacemap_v2=enabled \ + -o feature@userobj_accounting=enabled \ + -o feature@zpool_checkpoint=enabled \ + \ + $POOL raidz1 \ + /dev/disk/by-id/$DISK1-part3 \ + /dev/disk/by-id/$DISK2-part3 \ + /dev/disk/by-id/$DISK3-part3 + +zpool autoexpand=on $POOL +zpool autoreplace=off $POOL +zpool listsnapshots=off $POOL + +zfs set dedup=off $POOL +zfs set compression=off $POOL +zfs set atime=off $POOL +zfs set mountpoint=none $POOL +zfs set aclinherit=passthrough $POOL +zfs set acltype=posixacl $POOL +zfs set xattr=sa $POOL + +# Create Dataset System Root +zfs create -o mountpoint=none $POOL/system +zfs create -o mountpoint=/ $POOL/system/debian +#zfs mount $POOL/system/debian +zpool set bootfs=$POOL/system/debian $POOL + +zfs create -o compression=${ZFS_COMPRESSION_METHOD} $POOL/system/debian/var + +# Create Datasets .. +zfs create -o mountpoint=/home $POOL/users +zfs create -o mountpoint=/root $POOL/users/root + +zfs create -o mountpoint=/backup -o compression=${ZFS_COMPRESSION_METHOD} $POOL/backup +zfs create -o mountpoint=/data $POOL/data +zfs create -o mountpoint=/srv $POOL/services +zfs create -o mountpoint=/usr/local/projects -o compression=${ZFS_COMPRESSION_METHOD} $POOL/projects + +if [ ! -z "$MYSWAPSIZE" ]; then + # SWAP + zfs create -V $MYSWAPSIZE -b $(getconf PAGESIZE) -o compression=zle \ + -o logbias=throughput -o sync=always \ + -o primarycache=metadata -o secondarycache=none \ + -o com.sun:auto-snapshot=false $POOL/swap + + zfs set compression=zle $POOL/swap + zfs set logbias=throughput $POOL/swap + zfs set sync=always $POOL/swap + zfs set primarycache=metadata $POOL/swap + zfs set secondarycache=none $POOL/swap + zfs set com.sun:auto-snapshot=false $POOL/swap + zfs set checksum=off $POOL/swap + + mkswap -f /dev/zvol/$POOL/swap + echo /dev/zvol/$POOL/swap none swap defaults 0 0 >> /etc/fstab + # UUID=ee57ce05-7287-4b37-93c4-03aeaba756f1 + # /etc/fstab + # /dev/zvol/$POOL/swap none swap defaults 0 0 + # + # swapon /dev/zvol/$POOL/swap + # + echo "Swap: /etc/fstab modified" + echo "Swap: Enable: swapon /dev/zvol/$POOL/swap" +fi + diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_efi_disk.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_efi_disk.sh new file mode 100644 index 0000000..c9a5b75 --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_efi_disk.sh @@ -0,0 +1,37 @@ + +NDISK1=ata-QEMU_HARDDISK_QM00007 +NDISK2=ata-QEMU_HARDDISK_QM00009 +NDISK3=ata-QEMU_HARDDISK_QM00011 + +# Clear the partition table: +sgdisk --zap-all /dev/disk/by-id/$NDISK1 +sgdisk --zap-all /dev/disk/by-id/$NDISK2 +sgdisk --zap-all /dev/disk/by-id/$NDISK3 + +# 2.2 Partition your disk: +# +# Legacy (BIOS) booting (part-1): Used for GRUB boot-code in 'MBR-gap': +sgdisk -a1 -n1:40:8191 -t1:EF02 /dev/disk/by-id/$NDISK1 +sgdisk -a1 -n1:40:8191 -t1:EF02 /dev/disk/by-id/$NDISK2 +sgdisk -a1 -n1:40:8191 -t1:EF02 /dev/disk/by-id/$NDISK3 + +# Run this if you need legacy (EFI) booting: +sgdisk -n2:0:+1G -t2:EF00 /dev/disk/by-id/$NDISK1 +sgdisk -n2:0:+1G -t2:EF00 /dev/disk/by-id/$NDISK2 +sgdisk -n2:0:+1G -t2:EF00 /dev/disk/by-id/$NDISK3 + +#Run these in all cases: +sgdisk -n3:0:0 -t3:BF01 /dev/disk/by-id/$NDISK1 +sgdisk -n3:0:0 -t3:BF01 /dev/disk/by-id/$NDISK2 +sgdisk -n3:0:0 -t3:BF01 /dev/disk/by-id/$NDISK3 + +sleep 3 +sync + +# Create EFI filesystems +mkfs.fat -F32 /dev/disk/by-id/$NDISK1-part2 +mkfs.fat -F32 /dev/disk/by-id/$NDISK2-part2 +mkfs.fat -F32 /dev/disk/by-id/$NDISK3-part2 + +echo "Now replace the disk .." +echo "zpool replace risa 12458555210078177352 /dev/disk/by-id/ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0798JN-part1" diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_mpr_disk.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_mpr_disk.sh new file mode 100644 index 0000000..4335a25 --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/new_gpt_mpr_disk.sh @@ -0,0 +1,27 @@ + +NDISK1=ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0798JN +NDISK2=ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0791VU +NDISK3=ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA02K427 + +# Clear the partition table: +sgdisk --zap-all /dev/disk/by-id/$NDISK1 +#sgdisk --zap-all /dev/disk/by-id/$NDISK2 +#sgdisk --zap-all /dev/disk/by-id/$NDISK3 + +# 2.2 Partition your disk: +# +# Legacy (BIOS) booting (part-1): Used for GRUB boot-code in 'MBR-gap': +sgdisk -a1 -n1:40:8191 -t1:EF02 /dev/disk/by-id/$NDISK1 +#sgdisk -a1 -n1:40:8191 -t1:EF02 /dev/disk/by-id/$NDISK2 +#sgdisk -a1 -n1:40:8191 -t1:EF02 /dev/disk/by-id/$NDISK3 + +#Run these in all cases: +sgdisk -n2:0:0 -t2:BF01 /dev/disk/by-id/$NDISK1 +#sgdisk -n2:0:0 -t2:BF01 /dev/disk/by-id/$NDISK2 +#sgdisk -n2:0:0 -t2:BF01 /dev/disk/by-id/$NDISK3 + +sleep 3 +sync + +echo "Now replace the disk .." +echo "zpool replace risa 12458555210078177352 /dev/disk/by-id/ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0798JN-part1" diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/set_mountpoint.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/set_mountpoint.sh new file mode 100644 index 0000000..5413034 --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/set_mountpoint.sh @@ -0,0 +1,10 @@ +export POOL=tpool2 + +zfs set -u mountpoint=/backup $POOL/backup +zfs set -u mountpoint=/data $POOL/data +zfs set -u mountpoint=/usr/local/projects $POOL/projects +zfs set -u mountpoint=/srv $POOL/services +zfs set -u mountpoint=/ $POOL/system/debian +zfs set -u mountpoint=/home $POOL/users +zfs set -u mountpoint=/root $POOL/users/root + diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/zfs-zap-disk.txt b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/zfs-zap-disk.txt new file mode 100644 index 0000000..72185e8 --- /dev/null +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/setup/zfs-zap-disk.txt @@ -0,0 +1,27 @@ +#! /bin/sh + +strace -e pread64 zdb -l /dev/sdl >/dev/null +pread64(5, "\0\1\0\0\0\0\0\0\1\0\0\0000\0\0\0\7\0\0\0\1\0\0\0\23\0\0\0doze"..., 13920, 0) = 13920 +pread64(5, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 262144, 0) = 262144 +pread64(5, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 262144, 262144) = 262144 +pread64(5, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 262144, 16000900136960) = 262144 +pread64(5, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"..., 262144, 16000900399104) = 262144 ++++ exited with 2 +++ +[root@fs01 etc]# for f in 0 262144 16000900136960 16000900399104; do dd if=/dev/zero of=/dev/sdl bs=1 seek=$f count=262144; done +[root@fs01 etc]# for f in 0 262144 4000785367040 4000785629184; do dd if=/dev/zero of=/dev/disk/by-id/ata-WDC_WD40EFZX-68AWUN0_WD-WX92DA0798JN-part2 bs=1 seek=$f count=262144; done +262144+0 records in +262144+0 records out +262144 bytes (262 kB, 256 KiB) copied, 0.507745 s, 516 kB/s +262144+0 records in +262144+0 records out +262144 bytes (262 kB, 256 KiB) copied, 0.508549 s, 515 kB/s +262144+0 records in +262144+0 records out +262144 bytes (262 kB, 256 KiB) copied, 0.499234 s, 525 kB/s +262144+0 records in +262144+0 records out +262144 bytes (262 kB, 256 KiB) copied, 0.496669 s, 528 kB/s + +[root@fs01 etc]# partprobe /dev/sdl +### LSBLK shows sdl has no partitions, so far so good + diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian11-amd64.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian11-amd64.sh deleted file mode 100644 index 30644a3..0000000 --- a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian11-amd64.sh +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh - -ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.6-1-debian11-amd64` - -#skipped: -# libzfs5-devel_2.1.0-1_amd64.deb -# python3-pyzfs_2.1.0-1_amd64.deb -# zfs-dracut_2.1.0-1_amd64.deb -# zfs-test_2.1.0-1_amd64.deb -# zfs-2.1.0.tar.gz - -if [ -e /etc/default/zfs ] ; then - cp -a /etc/default/zfs /etc/default/zfs.cpy -fi - -#apt-get install libnvpair1 libuutil1 libzpool2 libzfs2 -dpkg -i $ZFSDEBDIR/libuutil3_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/libnvpair3_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/libzfs5_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/libzpool5_2.1.6-1_amd64.deb -#apt-get install zfs-dkms zfs zfs-initramfs -dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/zfs_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.6-1_amd64.deb - -apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3 - -# FIX /etc/default/zfs -# ZFS_INITRD_ADDITIONAL_DATASETS="$POOL/users $POOL/users/root $POOL/backup $POOL/data $POOL/services $POOL/projects" -# and run: update-initramfs -u -k all - -##apt-get install grub-common grub-pc grub-pc-bin grub2-common -# systemctl enable zfs-import-cache.service zfs-mount.service zfs-zed.service zfs-import.target zfs-volumes.target zfs.target -# systemctl start zfs-import-cache.service zfs-mount.service zfs-zed.service zfs-import.target zfs-volumes.target zfs.target - diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian12-amd64.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian12-amd64.sh index 27e3bdf..7aca3db 100644 --- a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian12-amd64.sh +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-install-debian12-amd64.sh @@ -1,30 +1,34 @@ #! /bin/sh -ZFSDEBDIR=`readlink -f ./zfs-linux-2.1.6-1-debian12-amd64` +ZFSDEBDIR=`readlink -f ./zfs-linux-2.2.6-1-debian12-amd64` #skipped: -# libzfs5-devel_2.1.0-1_amd64.deb -# python3-pyzfs_2.1.0-1_amd64.deb -# zfs-dracut_2.1.0-1_amd64.deb -# zfs-test_2.1.0-1_amd64.deb -# zfs-2.1.0.tar.gz +# kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb +# kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb +# kmod-zfs-devel_2.2.6-1_amd64.deb +# libzfs5-devel_2.2.6-1_amd64.deb +# python3-pyzfs_2.2.6-1_amd64.deb +# zfs-dracut_2.2.6-1_amd64.deb +# zfs-test_2.2.6-1_amd64.deb +# zfs-2.2.6.tar.gz if [ -e /etc/default/zfs ] ; then cp -a /etc/default/zfs /etc/default/zfs.cpy fi #apt-get install libnvpair1 libuutil1 libzpool2 libzfs2 -dpkg -i $ZFSDEBDIR/libuutil3_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/libnvpair3_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/libzfs5_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/libzpool5_2.1.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/libuutil3_2.2.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/libnvpair3_2.2.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/libzfs5_2.2.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/libzpool5_2.2.6-1_amd64.deb #apt-get install zfs-dkms zfs zfs-initramfs -dpkg -i $ZFSDEBDIR/zfs-dkms_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/zfs_2.1.6-1_amd64.deb -dpkg -i $ZFSDEBDIR/zfs-initramfs_2.1.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/zfs-dkms_2.2.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/zfs_2.2.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/pam-zfs-key_2.2.6-1_amd64.deb +dpkg -i $ZFSDEBDIR/zfs-initramfs_2.2.6-1_amd64.deb # apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool4 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3 -apt-mark manual zfs-initramfs zfs zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3 +apt-mark manual zfs-initramfs zfs pam-zfs-key zfs-dkms libzfs2 libzfs4 libzfs5 libzpool2 libzpool5 libuutil1 libuutil3 libnvpair1 libnvpair3 # FIX /etc/default/zfs # ZFS_INITRD_ADDITIONAL_DATASETS="$POOL/users $POOL/users/root $POOL/backup $POOL/data $POOL/services $POOL/projects" diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libnvpair3_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libnvpair3_2.1.6-1_amd64.deb deleted file mode 100644 index cf98f89..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libnvpair3_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libuutil3_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libuutil3_2.1.6-1_amd64.deb deleted file mode 100644 index f0e2d12..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libuutil3_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5-devel_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5-devel_2.1.6-1_amd64.deb deleted file mode 100644 index ad6bd4b..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5-devel_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5_2.1.6-1_amd64.deb deleted file mode 100644 index 2c836ae..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzfs5_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzpool5_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzpool5_2.1.6-1_amd64.deb deleted file mode 100644 index 72f637e..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/libzpool5_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/python3-pyzfs_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/python3-pyzfs_2.1.6-1_amd64.deb deleted file mode 100644 index e0be213..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/python3-pyzfs_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-2.1.6.tar.gz b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-2.1.6.tar.gz deleted file mode 100644 index a949ea1..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-2.1.6.tar.gz and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dkms_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dkms_2.1.6-1_amd64.deb deleted file mode 100644 index 523d74c..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dkms_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dracut_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dracut_2.1.6-1_amd64.deb deleted file mode 100644 index e8958c1..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-dracut_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-initramfs_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-initramfs_2.1.6-1_amd64.deb deleted file mode 100644 index a7440e6..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-initramfs_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-test_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-test_2.1.6-1_amd64.deb deleted file mode 100644 index b715f61..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs-test_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs_2.1.6-1_amd64.deb deleted file mode 100644 index 74a32ac..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian11-amd64/zfs_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libnvpair3_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libnvpair3_2.1.6-1_amd64.deb deleted file mode 100644 index 95b675b..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libnvpair3_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libuutil3_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libuutil3_2.1.6-1_amd64.deb deleted file mode 100644 index 5ce3757..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libuutil3_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5-devel_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5-devel_2.1.6-1_amd64.deb deleted file mode 100644 index aa1dd57..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5-devel_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5_2.1.6-1_amd64.deb deleted file mode 100644 index 8099000..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzfs5_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzpool5_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzpool5_2.1.6-1_amd64.deb deleted file mode 100644 index bb7d83c..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/libzpool5_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/python3-pyzfs_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/python3-pyzfs_2.1.6-1_amd64.deb deleted file mode 100644 index f057578..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/python3-pyzfs_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-2.1.6.tar.gz b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-2.1.6.tar.gz deleted file mode 100644 index cdb1100..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-2.1.6.tar.gz and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dkms_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dkms_2.1.6-1_amd64.deb deleted file mode 100644 index 389ad86..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dkms_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dracut_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dracut_2.1.6-1_amd64.deb deleted file mode 100644 index 94b9fb4..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-dracut_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-initramfs_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-initramfs_2.1.6-1_amd64.deb deleted file mode 100644 index fe1fdd7..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-initramfs_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-test_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-test_2.1.6-1_amd64.deb deleted file mode 100644 index e57146a..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs-test_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs_2.1.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs_2.1.6-1_amd64.deb deleted file mode 100644 index 408ab90..0000000 Binary files a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.1.6-1-debian12-amd64/zfs_2.1.6-1_amd64.deb and /dev/null differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb new file mode 100644 index 0000000..07c0296 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-6.1.0-26-amd64_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb new file mode 100644 index 0000000..c55d914 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel-6.1.0-26-amd64_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel_2.2.6-1_amd64.deb new file mode 100644 index 0000000..9aeb530 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/kmod-zfs-devel_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libnvpair3_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libnvpair3_2.2.6-1_amd64.deb new file mode 100644 index 0000000..d5866c0 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libnvpair3_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libuutil3_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libuutil3_2.2.6-1_amd64.deb new file mode 100644 index 0000000..96276f0 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libuutil3_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5-devel_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5-devel_2.2.6-1_amd64.deb new file mode 100644 index 0000000..adefb02 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5-devel_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5_2.2.6-1_amd64.deb new file mode 100644 index 0000000..d181a07 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzfs5_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzpool5_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzpool5_2.2.6-1_amd64.deb new file mode 100644 index 0000000..d560a93 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/libzpool5_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/pam-zfs-key_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/pam-zfs-key_2.2.6-1_amd64.deb new file mode 100644 index 0000000..171015e Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/pam-zfs-key_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/python3-pyzfs_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/python3-pyzfs_2.2.6-1_amd64.deb new file mode 100644 index 0000000..256d908 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/python3-pyzfs_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-2.2.6.tar.gz b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-2.2.6.tar.gz new file mode 100644 index 0000000..7c688fd Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-2.2.6.tar.gz differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dkms_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dkms_2.2.6-1_amd64.deb new file mode 100644 index 0000000..0c401a1 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dkms_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dracut_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dracut_2.2.6-1_amd64.deb new file mode 100644 index 0000000..7c3a53b Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-dracut_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-initramfs_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-initramfs_2.2.6-1_amd64.deb new file mode 100644 index 0000000..efb21d2 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-initramfs_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-test_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-test_2.2.6-1_amd64.deb new file mode 100644 index 0000000..48ecaf5 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs-test_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs_2.2.6-1_amd64.deb b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs_2.2.6-1_amd64.deb new file mode 100644 index 0000000..b18e5e2 Binary files /dev/null and b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-linux-2.2.6-1-debian12-amd64/zfs_2.2.6-1_amd64.deb differ diff --git a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-remove.sh b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-remove.sh index 08aff08..1268c1f 100644 --- a/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-remove.sh +++ b/stage_rescuezfs/00-install-zfs/files/root_zfs/zfs-remove.sh @@ -3,7 +3,7 @@ if [ -e /etc/default/zfs ] ; then cp -a /etc/default/zfs /etc/default/zfs.cpy fi -dpkg -r --force-all zfs-initramfs zfs zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3 -dpkg -P --force-all zfs-initramfs zfs zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3 +dpkg -r --force-all zfs-initramfs zfs pam-zfs-key zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3 +dpkg -P --force-all zfs-initramfs zfs pam-zfs-key zfs-dkms libzpool4 libzpool5 libzfs4 libzfs5 libnvpair3 libuutil3 #dpkg -r grub-common grub-pc grub-pc-bin grub2-common -- cgit v1.2.3