[02:56] <stgraber> cjwatson: so I was a bit bored tonight and couldn't think of a better way to use my time than try to merge netcfg since we're a tiny bit behind on that one.
[02:58] <stgraber> cjwatson: it's not the easiest merge ever but I'm making some progress. I ended up just generating diffs for all changes we ever made and I'm going through all of those one by one re-applying them on the current debian branch (seemed least painful than dealing with the thousands of conflicts a bzr merge would give me)
[03:41] <stgraber> cjwatson: alright, looks like I've got a plausible merge, including a diff that's actually readable now! Just need to get the package to build now (failing because of uncheck return values) and then do a massive amount of test on it (IPv6 and NetworkManager support being the bits I'm the most scared about)
[04:19] <stgraber> cjwatson: and got it building. Resulting changelog is http://paste.ubuntu.com/6280951/ and remaining delta (without the changelog) http://paste.ubuntu.com/6280952/
[04:19] <stgraber> (not sure what's going on with tg.po though, I clearly didn't touch that...)
[04:20] <stgraber> anyway, time for bed, will do the testing tomorrow
[17:07] <stgraber> cjwatson: looks like my netcfg merge is pretty solid. It's just passed my IPv4/IPv6 automated tests. Now doing a quick desktop install with it to check the NetworkManager behaviour and if that looks good too, I'll upload in a couple of hours.
[17:08] <cjwatson> stgraber: *nod* Sounds good, thanks for dealing with that, I'd been putting it off
[17:08] <cjwatson> stgraber: The tg.po diff could've been a bzr plugin
[17:08] <cjwatson> stgraber: Looks like it should be reverted
[17:09] <stgraber> np. I figured that as most netboot users stick to LTS, it'd be a good idea to get netcfg into a more managable state :)
[17:09] <cjwatson> Yeah, definitely
[17:48] <stgraber> neat, netcfg actually seems to be configuring NM properly!
[17:48] <stgraber> so no more ifblacklist hack and a valid NM configuration on top of that, that's a huge improvement for anyone doing static IP desktop netinstalls
[17:57] <stgraber> first time I try an IPv6 static install in d-i, works fine but it's a bit confusing having to enter the netmask in full instead of using cidr (ffff:ffff:ffff:ffff:: instead of /64)
[17:57] <stgraber> I guess I'll take a look at getting it to allow cidr, no idea how easy/hard that's to do in C
[18:07] <stgraber> ah, nevermind, it supports CIDR but you have to add it with the IP otherwise it prompts for the full mask, I guess that's reasonable
[18:32] <stgraber> looks like netcfg's NM config generator isn't perfect, the static config generated is invalid, I'll go back and fix the generator then
[19:54] <kentb> infinity: xnox sent me to you for this bug...it looks like the priority override for some reason didn't happen:  https://bugs.launchpad.net/ubuntu/+source/hw-detect/+bug/1243375     The idea with the changes in 13.10 was that the driver-injection-disk-detect would get loaded by default without having to pass any preseed parameters.  It looks as if it wasn't
[19:54] <kentb> entireley fixed or something else is going on.
[19:54] <ubot2> Launchpad bug 1243375 in hw-detect (Ubuntu) "13.10 Server installer doesn't load driver-injection-disk package by default" [Undecided,New]
[19:57] <infinity> kentb: Ahh, indeed, no one bugged an archive admin about twiddling the priority.  We can't do that post-release (at least, not in the release pocket)...
[19:57] <infinity> I can do it in trusty right now, before I forget.
[19:59] <infinity> kentb: If this is needed for saucy, I can copy it to the updates pocket and twiddle the priority there.  Not sure if d-i will look at that, off the top of my head.
[19:59] <infinity> cjwatson: ^-- Any idea?
[20:00] <kentb> infinity: trusty's fine, as long as it's fixed there if you can make something work for saucy it'll be a bonus :)
[20:00]  * kentb forgot a period between there and if
[20:01] <infinity> kentb: Fixed in trusty as of now (well, after the next publisher run).
[20:01] <kentb> infinity: excellent. thank you
[20:02] <infinity> kentb: If you can give it a whirl sometime in the next day and let us know if it still hates you, that would be informative.
[20:02] <infinity> kentb: We *could* probably fudge a fix for saucy, but if no one particularly cares deeply, I won't care either.
[20:03] <kentb> infinity: ok. I defintely will for trusty.  Saucy is a 'nice to have' at this point.
[20:04] <infinity> (my guess is that just copying the packages from the release pocket to -updates and then overriding the priority in -updates would do the trick)
[20:04] <infinity> Well, would do the trick for netboot type installs.  Wouldn't do much of anything useful for server ISOs.
[20:20] <kentb> right. got it.
[20:22] <stgraber> cjwatson: netcfg uploaded. If you have commit rights to the Debian git branch, most of our delta looks like it should be applied there too (FTBFS fixes, NetworkManager fix, dhcpv6_timeout change and the change to flush all addresses at least)
[22:31] <cjwatson> infinity: d-i looks at -updates by default for network installs, yes
[22:32] <cjwatson> stgraber: I ... may find time, not promising :)