mirror/systemback
1
0
Fork 0
mirror of https://github.com/hamonikr/systemback.git synced 2026-06-12 06:54:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

apply latest upstream

Browse Source
This commit is contained in:
Kevin Kim
2021-04-14 16:09:07 +09:00
parent a5ab810541
commit d65a8e0143
49 changed files with 1596 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libsystemback/sblib.cpp
View File

@@ -1,6 +1,5 @@
/*
* Copyright(C) 2020, Kevin Kim <root@hamonikr.org>
* 2014-2016, Krisztián Kende <nemh@freemail.hu>
* Copyright(C) 2018-2020, Franco Conidi <edmondweblog@gmail.com>
*
* This file is part of the Systemback.
*
@@ -943,7 +942,7 @@ QStr sb::gdetect(cQStr rdir)
{
QStr mnts(fload("/proc/self/mounts", true));
QTS in(&mnts, QIODevice::ReadOnly);
QSL incl[]{{"* " % rdir % " *", "* " % rdir % (rdir.endsWith('/') ? nullptr : "/") % "boot *"}, {"_/dev/sd*", "_/dev/hd*", "_/dev/vd*"}};
QSL incl[]{{"* " % rdir % " *", "* " % rdir % (rdir.endsWith('/') ? nullptr : "/") % "boot *"}, {"_/dev/sd*", "_/dev/hd*", "_/dev/nvme0*", "_/dev/vd*"}};
while(! in.atEnd())
{
@@ -1817,7 +1816,7 @@ void sb::run()
case Readprttns:
{
ThrdSlst->reserve(25);
QSL dlst{"_/dev/sd*", "_/dev/hd*", "_/dev/vd*", "_/dev/mmcblk*"};
QSL dlst{"_/dev/sd*", "_/dev/hd*", "_/dev/vd*", "_/dev/nvme0*", "_/dev/mmcblk*"};
for(cQStr &spath : QDir("/dev").entryList(QDir::System))
{
@@ -1921,7 +1920,7 @@ void sb::run()
{
ThrdSlst->reserve(10);
QBA fstab(fload("/etc/fstab"));
QSL dlst[]{{"_usb-*", "_mmc-*"}, {"_/dev/sd*", "_/dev/mmcblk*"}};
QSL dlst[]{{"_usb-*", "_mmc-*"}, {"_/dev/sd*", "_/dev/nvme0*", "_/dev/mmcblk*"}};
for(cQStr &item : QDir("/dev/disk/by-id").entryList(QDir::Files))
{