Skip to content

Commit 481707e

Browse files
linuxandos2desultory
authored andcommitted
Update resume.py to handle also UUID= and LABEL= among PARTUUID=
1 parent d0705bd commit 481707e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/ugrd/fs/resume.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ def resume(self) -> None:
3737

3838
def handle_early_resume(self) -> None:
3939
return [
40-
"resumeval=$(readvar resume)",
41-
'if ! check_var noresume && [ -n "$resumeval" ] ; then',
42-
' if echo "$resumeval" | grep -qE "^PARTUUID=|^UUID="; then',
40+
"resumeval=$(readvar resume)", # read the cmdline resume var
41+
'if ! check_var noresume && [ -n "$resumeval" ] && [ -w /sys/power/resume ]; then',
42+
' if echo "$resumeval" | grep -q "UUID=" ||', # resolve uuid to device
43+
' echo "$resumeval" | grep -q "PARTUUID=" ||', # or resolve partuuid to device
44+
' echo "$resumeval" | grep -q "LABEL=" ; then', # or resolve label to device
4345
' resume=$(blkid -t "$resumeval" -o device)',
4446
" else",
4547
' resume="$resumeval"',

0 commit comments

Comments
 (0)