mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 09:03:23 -05:00
Have the dev logic, now need to build device table.
This commit is contained in:
parent
e81b3fd1ba
commit
68c3a4476c
@ -35,7 +35,7 @@ use Exporter;
|
|||||||
@ISA = qw(Exporter);
|
@ISA = qw(Exporter);
|
||||||
@EXPORT = qw(start_logging_output info kernel_version_check verbosity
|
@EXPORT = qw(start_logging_output info kernel_version_check verbosity
|
||||||
read_contents_file extra_links library_dependencies hard_links
|
read_contents_file extra_links library_dependencies hard_links
|
||||||
space_check create_filesystem find_file_in_path sys
|
space_check create_filesystem find_file_in_path sys device_table
|
||||||
text_insert error logadj *LOGFILE which_tests create_fstab);
|
text_insert error logadj *LOGFILE which_tests create_fstab);
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
@ -198,36 +198,46 @@ sub read_contents_file {
|
|||||||
|
|
||||||
,x ) {
|
,x ) {
|
||||||
|
|
||||||
my $expr;
|
my ($expr, $tmp_line);
|
||||||
my @line;
|
|
||||||
for $expr (split(' ', $line)) {
|
for $expr (split(' ', $line)) {
|
||||||
if ( m,^/dev$|^/dev/, ) {
|
if ( $expr && $expr =~ m,^/dev$|^/dev/, ) {
|
||||||
|
|
||||||
|
# Do something here
|
||||||
|
my(@globbed) = yard_glob($expr);
|
||||||
|
if ($#globbed == -1) {
|
||||||
|
cf_warn($contents_file, $expr,
|
||||||
|
"Warning: No files matched $expr");
|
||||||
|
} elsif (!($#globbed == 0 and $globbed[0] eq $expr)) {
|
||||||
|
info(1, "Expanding $expr to @globbed\n");
|
||||||
|
}
|
||||||
|
|
||||||
# Do something here
|
# make device table
|
||||||
|
device_table(@globbed);
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
push(@line,$expr);
|
|
||||||
|
if ( $tmp_line ) {
|
||||||
|
$tmp_line = $tmp_line . " $expr";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$tmp_line = $expr;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $tmp_line ) {
|
||||||
|
$line = $tmp_line;
|
||||||
|
info(0,"D $line\n");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
next LINE;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
=pod
|
|
||||||
my($expr);
|
|
||||||
for $expr (split(' ', $line)) {
|
|
||||||
my(@globbed) = yard_glob($expr);
|
|
||||||
if ($#globbed == -1) {
|
|
||||||
cf_warn($contents_file, $expr,
|
|
||||||
"Warning: No files matched $expr");
|
|
||||||
} elsif (!($#globbed == 0 and $globbed[0] eq $expr)) {
|
|
||||||
info(1, "Expanding $expr to @globbed\n");
|
|
||||||
}
|
|
||||||
push(@files, @globbed);
|
|
||||||
}
|
|
||||||
=cut
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($line =~ /->/) { ##### EXPLICIT LINK
|
if ($line =~ /->/) { ##### EXPLICIT LINK
|
||||||
@ -1669,6 +1679,14 @@ sub yard_glob {
|
|||||||
|
|
||||||
} # end yard_glob
|
} # end yard_glob
|
||||||
|
|
||||||
|
# build device table for genext2fs
|
||||||
|
sub device_table {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
} # end sub device_table
|
||||||
|
|
||||||
sub mount_device {
|
sub mount_device {
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user