diff options
| author | nachtgeist <[email protected]> | 2021-10-08 18:16:31 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-08 11:16:31 -0700 |
| commit | a5b464263bc1f9fd833272a9e691cd479bf47d5d (patch) | |
| tree | 1dd47b14d0e13834c30b35cdfcc472e757d577ec /contrib/initramfs/scripts | |
| parent | 97bbeeb9380385ce5541d0be9ec3fd6f9c9f1d00 (diff) | |
initramfs: use correct dataset for rootfs on rollback=1
When booting with root=zfs:rpool/myrootfs@foosnapshot rollback=1,
myrootfs and its descendants get rolled back to foosnapshot, however
ZFS_BOOTFS still contains myrootfs@foosnapshot instead of the
actually desired value of myrootfs.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Signed-off-by: Daniel Reichelt <[email protected]>
Closes #12585
Closes #12586
Diffstat (limited to 'contrib/initramfs/scripts')
| -rw-r--r-- | contrib/initramfs/scripts/zfs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/initramfs/scripts/zfs b/contrib/initramfs/scripts/zfs index 306e6e157..35502291e 100644 --- a/contrib/initramfs/scripts/zfs +++ b/contrib/initramfs/scripts/zfs @@ -630,6 +630,7 @@ setup_snapshot_booting() then # Rollback snapshot rollback_snap "$s" || retval=$((retval + 1)) + ZFS_BOOTFS="${rootfs}" else # Setup a destination filesystem name. # Ex: Called with 'rpool/ROOT/debian@snap2' |