summaryrefslogtreecommitdiffstats
path: root/sys/isofs
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2005-02-18 10:49:55 +0000
committerrwatson <rwatson@FreeBSD.org>2005-02-18 10:49:55 +0000
commit9fe3efa6c31145b629b559e82b556b3637f04334 (patch)
tree71ee9f28942e2dbc9278a21059d3294fd06894d2 /sys/isofs
parent7aa570c0ee4fbd751aede6a8bc83b4db61e7ff53 (diff)
downloadFreeBSD-src-9fe3efa6c31145b629b559e82b556b3637f04334.zip
FreeBSD-src-9fe3efa6c31145b629b559e82b556b3637f04334.tar.gz
Conditionalize cd9660 chattiness regarding the nature of the file system
mounted (is it Joliet, RockRidge, High Sierra) based on bootverbose. Most file systems don't generate log messages based on details of the file system superblock, and these log messages disrupt sysinstall output during a new install from CD. We may want to explore exposing this status information using nmount() at some point. MFC after: 3 days
Diffstat (limited to 'sys/isofs')
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 5830f03..df1a628 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -428,7 +428,8 @@ iso_mountfs(devvp, mp, td)
if (high_sierra) {
/* this effectively ignores all the mount flags */
- log(LOG_INFO, "cd9660: High Sierra Format\n");
+ if (bootverbose)
+ log(LOG_INFO, "cd9660: High Sierra Format\n");
isomp->iso_ftype = ISO_FTYPE_HIGH_SIERRA;
} else
switch (isomp->im_flags&(ISOFSMNT_NORRIP|ISOFSMNT_GENS)) {
@@ -439,7 +440,8 @@ iso_mountfs(devvp, mp, td)
isomp->iso_ftype = ISO_FTYPE_9660;
break;
case 0:
- log(LOG_INFO, "cd9660: RockRidge Extension\n");
+ if (bootverbose)
+ log(LOG_INFO, "cd9660: RockRidge Extension\n");
isomp->iso_ftype = ISO_FTYPE_RRIP;
break;
}
@@ -447,7 +449,9 @@ iso_mountfs(devvp, mp, td)
/* Decide whether to use the Joliet descriptor */
if (isomp->iso_ftype != ISO_FTYPE_RRIP && joliet_level) {
- log(LOG_INFO, "cd9660: Joliet Extension (Level %d)\n", joliet_level);
+ if (bootverbose)
+ log(LOG_INFO, "cd9660: Joliet Extension (Level %d)\n",
+ joliet_level);
rootp = (struct iso_directory_record *)
sup->root_directory_record;
bcopy (rootp, isomp->root, sizeof isomp->root);
OpenPOWER on IntegriCloud