d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionalize cd9660 chattiness regarding the nature of the file system

Browse Source 
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
This commit is contained in:
rwatson 2005-02-18 10:49:55 +00:00
parent 7aa570c0ee
commit 9fe3efa6c3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -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);

10
sys/isofs/cd9660/cd9660_vfsops.c
View File

@ -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);