mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 09:03:23 -05:00
This fixes some messiness for the fstab test, and gets rid of an unecessary
test.
This commit is contained in:
parent
5b6cc2cb29
commit
b5d58a2312
@ -102,7 +102,7 @@ sub check_fstab {
|
|||||||
chomp;
|
chomp;
|
||||||
next if /^\#/ or /^\s*$/;
|
next if /^\#/ or /^\s*$/;
|
||||||
|
|
||||||
my($dev, $mp, $type, $opts) = split;
|
my($dev, $mp, $type, $opts) = split m,[\s\t]+,;
|
||||||
next if $mp eq 'none' or $type eq 'swap';
|
next if $mp eq 'none' or $type eq 'swap';
|
||||||
next if $dev eq 'none';
|
next if $dev eq 'none';
|
||||||
|
|
||||||
@ -123,24 +123,31 @@ sub check_fstab {
|
|||||||
warning("\t($.): You probably should include \"noauto\" option\n",
|
warning("\t($.): You probably should include \"noauto\" option\n",
|
||||||
"\tin the fstab entry of a hard disk. When the rescue floppy\n",
|
"\tin the fstab entry of a hard disk. When the rescue floppy\n",
|
||||||
"\tboots, the \"mount -a\" will try to mount $dev\n");
|
"\tboots, the \"mount -a\" will try to mount $dev\n");
|
||||||
|
}
|
||||||
} elsif ($dev eq $::floppy and $type ne 'ext2' and $type ne 'auto') {
|
elsif ($type eq 'proc') {
|
||||||
warning("\t($.): You've declared your floppy drive $::floppy",
|
|
||||||
" to hold\n",
|
|
||||||
"\ta $type filesystem, which is not ext2. The rescue floppy\n",
|
|
||||||
"\tis ext2, which may confuse 'mount -a' during boot.\n");
|
|
||||||
|
|
||||||
} elsif ($type eq 'proc') {
|
|
||||||
$proc_seen = 1;
|
$proc_seen = 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
close(FSTAB);
|
close(FSTAB);
|
||||||
warning("\tNo /proc filesystem defined.\n") unless $proc_seen;
|
warning("\tNo /proc filesystem defined.\n") unless $proc_seen;
|
||||||
print "Done with $FSTAB\n";
|
print "Done with $FSTAB\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# This is unecessary, besides lot of different types of filesystem
|
||||||
|
# types may be used.
|
||||||
|
## elsif ($dev eq $::floppy and $type ne 'ext2' and $type ne 'auto') {
|
||||||
|
## warning("\t($.): You've declared your floppy drive $::floppy",
|
||||||
|
## " to hold\n",
|
||||||
|
## "\ta $type filesystem, which is not ext2. The rescue floppy\n",
|
||||||
|
## "\tis ext2, which may confuse 'mount -a' during boot.\n");
|
||||||
|
## }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
sub check_inittab {
|
sub check_inittab {
|
||||||
my($INITTAB) = "/etc/inittab";
|
my($INITTAB) = "/etc/inittab";
|
||||||
print "\nChecking $INITTAB\n";
|
print "\nChecking $INITTAB\n";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user