On Wed, 2015-06-17 at 20:52 -0700, Josef Bacik wrote: > On 06/17/2015 05:39 PM, Ian Kent wrote: > > Hi Josef, > > > > Hope you are well. > > > > On Wed, 2015-06-17 at 09:29 -0700, Josef Bacik wrote: > >> This is a patch to fix > >> > >> http://bugzilla.centos.org/view.php?id=8614 > >> > >> The configuration stuff was redone and it broke backwards compatiblity. > > > > OK, but I put quite a bit of effort in to not do that. > > > > I thought it more likely I'd get complaints from people not realizing an > > old configuration left in place would override changes in the new > > configuration. > > > > Can you give me an example of the problem you have seen please. > > > >> Unfortunately this was backported to Centos/RHEL, so configurations that were > >> working in 6.4 suddenly broke in 6.6, which is not helpful. Fix this by > >> noticing if we are looking at the old configuration file, strip out the DEFAULT_ > >> bit of the variable if it is there and tolower the rest of the string. This > >> makes it so our old configuration works properly and now people get their home > >> dirs automounted properly with either versions of autofs. Thanks, > > > > The way this is supposed to work is that the new configuration file is > > read and then the old one is read and anything in the old configuration > > file should override anything in the new one. > > > > When looking up configuration values if the key isn't found and the key > > starts with "DEFAULT_" the the key is looked for again without the > > "DEFAULT_". Also, key comparisons are case insensitive so that shouldn't > > make a difference. > > Oh now I realize why it's not working. When you do defaults_get_schema > you are looking up the new values, so your check in conf_lookup isn't > helping anything, because we aren't looking up DEFAULT_*, we're looking > up the new values. And since we don't have those variables set in > autofs.conf they don't get set until we load the old things, and so we > have DEFAULT_* set in the conf but not the normal variables. So we can > do what I've done here, or change conf_lookup to add the DEFAULT_ to the > front of anything we search for if we can't find it. Thanks, Yes, I was thinking about this and I think my handling of configuration entries with a "DEFAULT_" prefix might be backward. It's been so long (from an upstream POV) since the "DEFAULT_" prefix was used I've probably got it wrong. Thought I tested it though .... Let me look further. > > Josef > -- To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
