This gets just about every option working, except for uml-kernel and

preserve-ownership.  Adds color --stdout.  Basically, the bare min is
--template and --stdout for display on console.
This commit is contained in:
freesource
2002-11-14 08:21:18 +00:00
parent 2f4e1cdcc6
commit f960c66fcb
4 changed files with 110 additions and 43 deletions
+15 -6
View File
@@ -1,4 +1,4 @@
#############################################################################
############################################################################
##
## Yard.pm combining
## MAKE_ROOT_FS, CHECK_ROOT_FS, and YARD_UTILS.PL by Tom Fawcett
@@ -47,6 +47,7 @@ use File::Path;
use FileHandle;
use Cwd; # I am not even sure if this is being used here now
use English; # I think this can be ditched for portability
use Term::ANSIColor; # for commandline output
use File::Find; # used by check_root_fs
use BootRoot::BootRoot;
use BootRoot::Error;
@@ -537,6 +538,7 @@ sub extra_links {
$find_nss = $nss_pam->{60}{conf_nss};
$find_pam = $nss_pam->{61}{conf_pam};
# Determine how the PASS is configured by the user.
if ( $find_nss != 1 && $find_pam != 1 ) {
info(0, "PASS 2: Picking up extra files from links...\n");
@@ -1828,11 +1830,18 @@ sub info {
}
if ( %option ) {
print @msgs;
if ( $option{stdout} ) {
if ( %option ) {
if ($level == 0) {
print color("blue"), @msgs, color("reset");
}
elsif ($level == 1) {
print color("red"), @msgs, color("reset");
}
}
}
}
} # end sub info
## This will produce red.
sub error {
@@ -2198,7 +2207,7 @@ sub kernel_version {
my $error;
# check if we have a normal file (-f dereferences symbolic links)
if (!-f $image) {
if (!$image || !-f $image) {
#$error = error("Kernel image ($image) is not a plain file.\n");
#return "ERROR"if $error && $error eq "ERROR";
$error = warning("Kernel image ($image) is not a plain file.\n");