Apply upstream patch for temp dir usage with LUKS
Resolves: rhbz2228779
This commit is contained in:
parent
c8e1042bba
commit
faf643ce1a
25
rear-luks-key-bz2228779.patch
Normal file
25
rear-luks-key-bz2228779.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
commit 2aa7b47354bdf5863071c8b479d29c99aad05ecb
|
||||||
|
Author: Johannes Meixner <jsmeix@suse.com>
|
||||||
|
Date: Fri Jul 24 13:02:45 2020 +0200
|
||||||
|
|
||||||
|
Update 240_reassign_luks_keyfiles.sh
|
||||||
|
|
||||||
|
Use ReaR specific TMP_DIR (not TMPDIR or hardcoded /tmp)
|
||||||
|
|
||||||
|
diff --git a/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh b/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh
|
||||||
|
index d989c3fb..358f3950 100644
|
||||||
|
--- a/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh
|
||||||
|
+++ b/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh
|
||||||
|
@@ -24,9 +24,9 @@ awk '
|
||||||
|
while read target_name source_device original_keyfile; do
|
||||||
|
Log "Re-assigning keyfile $original_keyfile to LUKS device $target_name ($source_device)"
|
||||||
|
|
||||||
|
- # The scheme for generating a temporary keyfile path must be the same here and in the 'layout/prepare' stage.
|
||||||
|
- temp_keyfile="${TMPDIR:-/tmp}/LUKS-keyfile-$target_name"
|
||||||
|
- [ -f "$temp_keyfile" ] || BugError "temporary keyfile $temp_keyfile not found"
|
||||||
|
+ # The scheme for generating a temporary keyfile path must be the same here and in the 'layout/prepare' stage:
|
||||||
|
+ temp_keyfile="$TMP_DIR/LUKS-keyfile-$target_name"
|
||||||
|
+ test -f "$temp_keyfile" || BugError "temporary LUKS keyfile $temp_keyfile not found"
|
||||||
|
|
||||||
|
target_keyfile="$TARGET_FS_ROOT/$original_keyfile"
|
||||||
|
|
@ -36,6 +36,7 @@ Patch54: rear-bz2131946.patch
|
|||||||
Patch56: s390-no-clobber-disks.patch
|
Patch56: s390-no-clobber-disks.patch
|
||||||
Patch58: rear-device-shrinking-bz2223895.patch
|
Patch58: rear-device-shrinking-bz2223895.patch
|
||||||
Patch59: rear-usb-uefi-part-size-bz2228402.patch
|
Patch59: rear-usb-uefi-part-size-bz2228402.patch
|
||||||
|
Patch60: rear-luks-key-bz2228779.patch
|
||||||
|
|
||||||
### Dependencies on all distributions
|
### Dependencies on all distributions
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
@ -165,6 +166,7 @@ fi
|
|||||||
%patch56 -p1
|
%patch56 -p1
|
||||||
%patch58 -p1
|
%patch58 -p1
|
||||||
%patch59 -p1
|
%patch59 -p1
|
||||||
|
%patch60 -p1
|
||||||
|
|
||||||
echo "30 1 * * * root test -f /var/lib/rear/layout/disklayout.conf && /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron
|
echo "30 1 * * * root test -f /var/lib/rear/layout/disklayout.conf && /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user