Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Liberate
backupninja
Merge requests
!7
#11273
: Exclude partitions from device list
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
#11273
: Exclude partitions from device list
romain/backupninja:master
into
master
Overview
0
Commits
1
Changes
1
Merged
Romain Dessort
requested to merge
romain/backupninja:master
into
master
7 years ago
Overview
0
Commits
1
Changes
1
Expand
Use lsblk instead of sfdisk to get a list of block devices on the host.
1
0
Merge request reports
Compare
master
version 4
dff9ac99
7 years ago
version 3
dff9ac99
7 years ago
version 2
dff9ac99
7 years ago
version 1
dff9ac99
7 years ago
master (base)
and
latest version
latest version
dff9ac99
1 commit,
7 years ago
version 4
dff9ac99
1 commit,
7 years ago
version 3
dff9ac99
1 commit,
7 years ago
version 2
dff9ac99
1 commit,
7 years ago
version 1
dff9ac99
1 commit,
7 years ago
1 file
+
2
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
handlers/sys.in
+
2
−
1
Options
@@ -107,6 +107,7 @@ getconf sysreportfile $parentdir/sysreport.txt
getconf SFDISK
`
which sfdisk
`
getconf HWINFO
`
which hwinfo
`
getconf LSBLK
`
which lsblk
`
getconf sfdisk_options
""
getconf hwinfo_options
""
@@ -607,7 +608,7 @@ fi
if
[
"
$partitions
"
==
"yes"
]
;
then
if
[
"
$dosfdisk
"
==
"yes"
]
;
then
devices
=
`
LC_ALL
=
C
$
SFDISK
-l
2>/dev/null |
grep
"
^D
isk
/dev
"
| @AWK@
'{print $
2
}'
|
cut
-d
:
-f1
`
devices
=
`
LC_ALL
=
C
$
LSBLK
--output
NAME,TYPE
--list
--paths
2>/dev/null |
grep
"
d
isk
$
"
| @AWK@
'{print $
1
}'
`
if
[
"
$devices
"
==
""
]
;
then
warning
"No harddisks found"
fi
Loading