From 56a52c740961dff05b618addae84bb7d35954390 Mon Sep 17 00:00:00 2001 From: Max Christian Pohle Date: Sun, 12 Jul 2020 13:14:56 +0200 Subject: Improved README --- README.md | 28 ++++++++++-------------- systemd-zfs-partition-backup/AUR/PKGBUILD | 2 +- systemd-zfs-partition-backup/AUR/getsha256sum.sh | 2 +- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index a1f7950..0b0c2e0 100644 --- a/README.md +++ b/README.md @@ -11,23 +11,17 @@ ### crypttab -``` -# /etc/crypttab example - -SomeDisk_SDSSDH0000G_123456789-part2 /dev/disk/by-id/SomeDisk_SDSSDH0000G_123456789-part2 /etc/.crypt/SomeDisk_SDSSDH0000G_123456789-part2.key noauto,x-systemd.device-timeout=5s -``` + # /etc/crypttab example + SomeDisk_SDSSDH0000G_123456789-part2 /dev/disk/by-id/SomeDisk_SDSSDH0000G_123456789-part2 /etc/.crypt/SomeDisk_SDSSDH0000G_123456789-part2.key noauto,x-systemd.device-timeout=5s ### fstab -``` -# /etc/fstab example - -# Note that the connector name has been removed from the mountpoint. -# The automount unit will be named after that and so must the zfs dataset -/dev/disk/by-id/ata-SomeDisk_SDSSDH0000G_123456789-part1 /media/SomeDisk_SDSSDH0000G_123456789-part1 auto defaults,noauto,ro,x-systemd.automount,x-mount.mkdir,x-systemd.idle-timeout=1min,x-systemd.device-timeout=5s 0 0 - -# The following name takes the name we gave our disk in the crypttab (first column). -# Such devices are then available via /dev/mapper/: -/dev/mapper/SomeDisk_SDSSDH0000G_123456789-part2 /media/SomeDisk_SDSSDH0000G_123456789-part2 auto defaults,noauto,ro,x-systemd.automount,x-mount.mkdir,x-systemd.idle-timeout=1min,x-systemd.device-timeout=5s 0 0 -``` - + # /etc/fstab example + + # Note that the connector name has been removed from the mountpoint. + # The automount unit will be named after that and so must the zfs dataset + /dev/disk/by-id/ata-SomeDisk_SDSSDH0000G_123456789-part1 /media/SomeDisk_SDSSDH0000G_123456789-part1 auto defaults,noauto,ro,x-systemd.automount,x-mount.mkdir,x-systemd.idle-timeout=1min,x-systemd.device-timeout=5s 0 0 + + # The following name takes the name we gave our disk in the crypttab (first column). + # Such devices are then available via /dev/mapper/: + /dev/mapper/SomeDisk_SDSSDH0000G_123456789-part2 /media/SomeDisk_SDSSDH0000G_123456789-part2 auto defaults,noauto,ro,x-systemd.automount,x-mount.mkdir,x-systemd.idle-timeout=1min,x-systemd.device-timeout=5s 0 0 diff --git a/systemd-zfs-partition-backup/AUR/PKGBUILD b/systemd-zfs-partition-backup/AUR/PKGBUILD index 21acfb4..7b63126 100644 --- a/systemd-zfs-partition-backup/AUR/PKGBUILD +++ b/systemd-zfs-partition-backup/AUR/PKGBUILD @@ -14,7 +14,7 @@ depends=( 'rsync' ) source=("http://git.entwicklerseite.de/zfs-bash-tools/snapshot/zfs-bash-tools-master.tar.gz") -sha256sums=('efb8f8f11401ffb8afc4ad228f9c6d6daffcd2451940d922a31b85076623a932') +sha256sums=('c4b26972196708138a17e096442b32af823e538c9b3415bab8c4416e6f5594b2') package() { install -D zfs-bash-tools-master/${pkgname}.sh \ diff --git a/systemd-zfs-partition-backup/AUR/getsha256sum.sh b/systemd-zfs-partition-backup/AUR/getsha256sum.sh index df3d588..f90c850 100755 --- a/systemd-zfs-partition-backup/AUR/getsha256sum.sh +++ b/systemd-zfs-partition-backup/AUR/getsha256sum.sh @@ -14,7 +14,7 @@ ARCHIVE=$(mktemp --suffix=.tar.bz2) echo $ARCHIVE cd $(git rev-parse --show-toplevel) -git archive --format=tar.gz --prefix=zfs-bash-tools-master/ -o "$ARCHIVE" master +git archive --format=tar.gz --prefix=zfs-bash-tools-master/ -o "$ARCHIVE" HEAD cd - > /dev/null echo "# Archive content" -- cgit v1.2.3