kudos/hpux_scripts
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for discovering boot disks + fix on /dev/ prefix for VG name

Browse Source
This commit is contained in:
Patrick Van der Veken 2019-02-08 15:44:35 +01:00
parent c05ff9b73a
commit 94a2daaf70
3 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lx-lvm/lvs.pl
View File

@ -74,10 +74,7 @@ unless ($options{'size'}) {
$options{'size'} = 'GB'; $options{'size'} = 'GB';
}; };
if ($options{'vg'}) { if ($options{'vg'}) {
if ($options{'vg'} =~ m#/dev#) { $options{'vg'} =~ s#/dev/##;
print STDERR "ERROR: do not specify your VG with '/dev/...'. Only use the short VG name\n\n";
exit (0);
}
}; };
# fetch LVOLs # fetch LVOLs
@ -217,3 +214,4 @@ S< >Do not show header and footer information.
@(#) 2016-04-27: small fixes [Patrick Van der Veken] @(#) 2016-04-27: small fixes [Patrick Van der Veken]
@(#) 2016-06-27: added LV extents [Patrick Van der Veken] @(#) 2016-06-27: added LV extents [Patrick Van der Veken]
@(#) 2017-12-12: made LV+VG names display size dynamic, added --terse [Patrick Van der Veken] @(#) 2017-12-12: made LV+VG names display size dynamic, added --terse [Patrick Van der Veken]
@(#) 2019-02-08: remove /dev/ prefix for VG [Patrick Van der Veken]

20
lx-lvm/pvs.pl
View File

@ -54,7 +54,7 @@ sub parse_pvols {
my @pvol = @_; my @pvol = @_;
my $pv_command; my $pv_command;
my %pvdisplay; my %pvdisplay;
my @dsf; my (@dsf,@sorted_dsf,@has_underscore);
unless (@pvol) { unless (@pvol) {
print "-- no disks found --\n"; print "-- no disks found --\n";
@ -108,8 +108,16 @@ sub parse_pvols {
push (@dsf, $dsf); push (@dsf, $dsf);
} }
# display pvol data (sorted by their device number: diskYYYY) # set comparison operator based on dsf type
foreach my $dsf (sort { substr($a, 4) <=> substr($b, 4) } (@dsf)) { @has_underscore = grep { /_/ } @dsf;
if (@has_underscore) {
@sorted_dsf = sort { substr($a, 4) cmp substr($b, 4) } (@dsf);
} else {
@sorted_dsf = sort { substr($a, 4) <=> substr($b, 4) } (@dsf);
}
# display pvol data (sorted by their device number: diskYYYY or diskXXXX_pY)
foreach my $dsf (@sorted_dsf) {
chomp ($dsf); chomp ($dsf);
@ -223,10 +231,7 @@ unless ($options{'size'}) {
$options{'size'} = 'GB'; $options{'size'} = 'GB';
}; };
if ($options{'vg'}) { if ($options{'vg'}) {
if ($options{'vg'} =~ m#/dev#) { $options{'vg'} =~ s#/dev/##;
print STDERR "ERROR: do not specify your VG with '/dev/...'. Only use the short VG name\n\n";
exit (0);
}
# force --active off # force --active off
delete $options{'active'}; delete $options{'active'};
}; };
@ -334,3 +339,4 @@ on the amount of devices present on the system.
@(#) 2016-04-27: small fixes [Patrick Van der Veken] @(#) 2016-04-27: small fixes [Patrick Van der Veken]
@(#) 2016-04-27: show all PVOLs & option --active added [Patrick Van der Veken] @(#) 2016-04-27: show all PVOLs & option --active added [Patrick Van der Veken]
@(#) 2017-12-12: added support for cluster disks, added --terse [Patrick Van der Veken] @(#) 2017-12-12: added support for cluster disks, added --terse [Patrick Van der Veken]
@(#) 2019-02-08: fix for comparison operator + remove /dev/ prefix for VG [Patrick Van der Veken]

6
lx-lvm/vgs.pl
View File

@ -75,10 +75,7 @@ unless ($options{'size'}) {
$options{'size'} = 'GB'; $options{'size'} = 'GB';
}; };
if ($options{'vg'}) { if ($options{'vg'}) {
if ($options{'vg'} =~ m#/dev#) { $options{'vg'} =~ s#/dev/##;
print STDERR "ERROR: do not specify your VG with '/dev/...'. Only use the short VG name\n\n";
exit (0);
}
# force --active off # force --active off
delete $options{'active'}; delete $options{'active'};
}; };
@ -237,3 +234,4 @@ S< >Do not show header and footer information.
@(#) 2016-04-12: first version [Patrick Van der Veken] @(#) 2016-04-12: first version [Patrick Van der Veken]
@(#) 2016-04-27: added 'VG Major/Minor' [Patrick Van der Veken] @(#) 2016-04-27: added 'VG Major/Minor' [Patrick Van der Veken]
@(#) 2017-12-12: made VG name display size dynamic, added --active, added --terse [Patrick Van der Veken] @(#) 2017-12-12: made VG name display size dynamic, added --active, added --terse [Patrick Van der Veken]
@(#) 2019-02-08: remove /dev/ prefix for VG [Patrick Van der Veken]