Skip to content

BCF-6552: [REAR] REAR tries to map the disk that has been commented in the disklayout.conf file on the source machine #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Barys Barysenka (BarysBarysenka) wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

BCF-6552: [REAR] REAR tries to map the disk that has been commented in the disklayout.conf file on the source machine #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
742f4f1
feat(layout): exclude AUTOEXCLUDE_PATH entries from df.txt
BarysBarysenka Mar 10, 2026
4726d84
feat(layout): prevent failure when mapping excluded disks in df.txt
BarysBarysenka Mar 13, 2026
9f0e24a
feat(layout): exclude AUTOEXCLUDE_PATH entries from df.txt
BarysBarysenka Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions usr/share/rear/layout/prepare/default/320_apply_mappings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ for file_to_migrate in "$LAYOUT_FILE" "$original_disk_space_usage_file" "$rescue
if apply_layout_mappings "$file_to_migrate" ; then
DebugPrint "Applied disk layout mappings to $file_to_migrate"
else
LogPrintError "Failed to apply disk layout mappings to $file_to_migrate"
applied_mappings_to_all_files="no"
if [ "$file_to_migrate" = "$original_disk_space_usage_file" ] ; then
LogPrint "WARNING: Failed to apply disk layout mappings to $file_to_migrate (likely due to unmapped excluded disks)."
else
LogPrintError "Failed to apply disk layout mappings to $file_to_migrate"
applied_mappings_to_all_files="no"
fi
fi
done
is_true $applied_mappings_to_all_files || Error "Failed to apply disk layout mappings"
Expand Down
17 changes: 17 additions & 0 deletions usr/share/rear/layout/save/GNU/Linux/510_current_disk_usage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,20 @@ else
df -Pl -BM -x encfs -x tmpfs -x devtmpfs >$original_disk_space_usage_file
fi

# Automatically comment out lines in original_disk_space_usage_file that match AUTOEXCLUDE_PATH
if test "$AUTOEXCLUDE_PATH" ; then
for exclude in "${AUTOEXCLUDE_PATH[@]}" ; do
while read _ _ _ _ _ mountpoint ; do
# Check if mountpoint is a subdirectory of the exclude path
# Logic matching layout/save/default/320_autoexclude.sh:
if test "${mountpoint#${exclude%/}/}" != "$mountpoint" ; then
DebugPrint "Automatically excluding $mountpoint from $original_disk_space_usage_file (belongs to $exclude in AUTOEXCLUDE_PATH)"
local mp_pattern
# Escape the mountpoint for use in the subsequent sed command
mp_pattern=$( echo "$mountpoint" | sed 's/[][\/$*.^,]/\\&/g' )
# Comment out the line
sed -i "\, $mp_pattern$,s/^/#/" "$original_disk_space_usage_file"
fi
done < <( grep -v -E "^Filesystem|^#" "$original_disk_space_usage_file" )
done
fi