cifs_mount: add USE_NETBIOS option; when skipping nmblookup, determine ip via nslookup#125
Open
ShoelaceMan wants to merge 1 commit intoMiSTer-devel:masterfrom
Open
cifs_mount: add USE_NETBIOS option; when skipping nmblookup, determine ip via nslookup#125ShoelaceMan wants to merge 1 commit intoMiSTer-devel:masterfrom
ShoelaceMan wants to merge 1 commit intoMiSTer-devel:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This change adds
USE_NETBIOSto control NetBIOS lookups for non-IPSERVERvalues. When NetBIOS is skipped, the script now resolves an address withnslookupand assigns that address back toSERVER, mirroring the existingnmblookuppath. All existing iptables handling and mount paths remain unchanged.Why
Running
nmblookupunconditionally is unreliable with DNS hostnames and FQDNs. Some environments prefer DNS and do not use NetBIOS. Providing a switch and a DNS path improves reliability while keeping the rest of the script intact by continuing to rewriteSERVERto the resolved address.What changed
New option
USE_NETBIOSdeclared alongside the other user options:auto(default): use NetBIOS only whenSERVERlooks like a NetBIOS name (no dot and length <= 15). Otherwise skip NetBIOS.never: do not use NetBIOS.always: preserve legacy behavior for non-IP values.In the non-IP branch:
nmblookupwhen requested, then setSERVERfromnmblookup.SERVERfromnslookupby extracting the last IPv4 “Address:” line. This keeps the downstream code paths identical sinceSERVERends up as an address in both cases.Configuration
Users can override in
cifs_mount.ini:Compatibility
autokeeps short NetBIOS names working as before.USE_NETBIOS="always"restores prior behavior completely.Testing
SERVER="RETRONAS"(short, no dot): NetBIOS wait runs,SERVERis set fromnmblookup, mount proceeds as before.SERVER="retronas.example.local"with defaultautoornever: ping wait runs,SERVERis set fromnslookupto an IPv4 address, mount succeeds.SERVER="192.168.0.50"(IP): unchanged.Notes
nslookupparse usesawkto select the last IPv4 “Address:” line and assigns it toSERVER, matching the existing pattern used withnmblookup.