Re: [PATCH] fs/nls/Config.in

From: Urban Widmark (urban@svenskatest.se)
Date: Thu Oct 19 2000 - 15:20:25 EST


On Thu, 19 Oct 2000, Tom Rini wrote:

> Hello all. The attached patch changes the behavoir of fs/nls/Config.in from:
> CONFIG_SMB_FS != n to CONFIG_INET = y && CONFIG_SMB_FS != n. This is neeed
> because if CONFIG_INET isn't set, CONFIG_SMB_FS isn't asked about and
> therefor isn't set at all, so CONFIG_NLS is set to y. My only question about
> this patch is if it shouldn't have depended on CONFIG_SMB_NLS_DEFAULT to start
> with? (Maintainer CC'ed).

It was supposed to be ok to not have a default nls value set but still be
able to activate nls if you want to. Giving it the old no-nls behaviour
until you say otherwise. Missing support from smbmount is the main reason
for having the default.

One solution might be to change the smbfs config to look more like the
ncpfs config and force a 'n' value if CONFIG_INET isn't 'y'. Patch for
this below, but the second patch you sent looks fine too. You didn't say
which kernel version you are using ...

You could also try the cml2 config tool. The cml2 config language is much
better at handling unset values and the current version has no problems
with this (n is the same as undefined, as I understand it).
        http://www.tuxedo.org/~esr/kbuild
(if you test it, kernel-rules.cml may need a search&replace of INTEGRATOR
 with ARCH_INTEGRATOR)

/Urban

--- linux-2.4.0-test10-pre4-orig/fs/Config.in Thu Oct 19 21:36:16 2000
+++ linux-2.4.0-test10-pre4-smbfs/fs/Config.in Thu Oct 19 21:44:42 2000
@@ -98,12 +98,17 @@
      define_bool CONFIG_LOCKD_V4 y
    fi
 
- dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
- if [ "$CONFIG_SMB_FS" != "n" ]; then
- bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT
- if [ "$CONFIG_SMB_NLS_DEFAULT" = "y" ]; then
- string ' Default Remote NLS Option' CONFIG_SMB_NLS_REMOTE "cp437"
+ if [ "$CONFIG_INET" != "n" ]; then
+ tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS
+ if [ "$CONFIG_SMB_FS" != "n" ]; then
+ bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT
+ if [ "$CONFIG_SMB_NLS_DEFAULT" = "y" ]; then
+ string ' Default Remote NLS Option' CONFIG_SMB_NLS_REMOTE "cp437"
+ fi
       fi
+ else
+ # for fs/nls/Config.in
+ define_bool CONFIG_SMB_FS n
    fi
    if [ "$CONFIG_IPX" != "n" -o "$CONFIG_INET" != "n" ]; then
       tristate 'NCP file system support (to mount NetWare volumes)' CONFIG_NCP_FS

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Oct 23 2000 - 21:00:15 EST