cvs commit: src/lib/libdisk open_disk.c

[Rink Springer]

rink        2007-08-05 16:55:40 UTC

  FreeBSD src repository

  Modified files:
    lib/libdisk          open_disk.c 
  Log:
  Improve error handling in libdisk while parsing the kern.geom.conftxt sysctl.
  Previously, any parse error will result in the calling program exiting with an
  unpleasant message. This change will cause libdisk to issue a warning and
  ignore lines it cannot parse instead of bluntly terminating the unfortunate
  enough program.
  
  This change will allow you to use sysinstall if you have a NTFS parition with
  a space in the name (such as 'Win Xp'). In such a case, a line like the
  following will appear in the kern.geom.conftxt output:
  
  2 LABEL ntfs/Win Xp 209818635264 512 i 0 o 0
  
  As the fields are space-separated, libdisk would go beserk and exit the program.
  This would happen if using FreeBSD 7.0 snapshot images (as GEOM_LABEL is in
  the installation kernel as well), thus making it impossible to install FreeBSD
  without renaming your NTFS paritions.
  
  Reported by:    Dwight Berendse <dwight at berendse dot org>
  Nod from:       phk
  Reviewed by:    imp
  Approved by:    re (bmah), imp (mentor)
  MFC after:      1 month
  
  Revision  Changes    Path
  1.11      +38 -19    src/lib/libdisk/open_disk.c