forked from void-linux/void-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
timeshift: fix compatibility with util-linux 2.37.1.
Timeshift will only start in "Live USB Mode". Upstream issues: teejee2008/timeshift#425 teejee2008/timeshift#753 teejee2008/timeshift#755
- Loading branch information
Showing
2 changed files
with
24 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| commit d437358ac3debf7625aefda4d0bd387a91b69df5 | ||
| Author: Tony George <[email protected]> | ||
| Date: Sun Jun 6 12:04:07 2021 +0530 | ||
|
|
||
| Fix for #425, #753, #755 | ||
|
|
||
| diff --git a/src/Utility/Device.vala b/src/Utility/Device.vala | ||
| index 18f09de..b276055 100755 | ||
| --- a/src/Utility/Device.vala | ||
| +++ b/src/Utility/Device.vala | ||
| @@ -428,10 +428,10 @@ public class Device : GLib.Object{ | ||
|
|
||
| try{ | ||
| if (lsblk_is_ancient){ | ||
| - rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)""""); | ||
| + rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)""""); | ||
| } | ||
| else{ | ||
| - rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)""""); | ||
| + rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)""""); | ||
| } | ||
|
|
||
| if (rex.match (line, 0, out match)){ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8e97a96There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a conversation recently with a man who owns a company that sells preloaded linux machines to businesses. He asked me if I was using ZFS and I said no, because it was still iffy in beta as far as I knew. He said I hope not It is released and I ship it every day. So I took his word for it, and when I set up my new development machine this week, I used ZFS. Well, that alligator didn't take long to bite me in the ass. I just spend several days configuring my development machine and I was just finishing up with timeshift. Oh hell. Time to take forty steps back and use ext4.