=== ebel_ is now known as ebel
=== ebel_ is now known as ebel
=== cjwatson_ is now known as cjwatson
=== cjwatson_ is now known as cjwatson
[06:12] <cjwatson> evand: uploaded base-installer, with just a couple of really minor tweaks (s/Bzr-Svn/Vcs-Bzr/ and s/ubuntu-archive-keyring-udeb/ubuntu-keyring-udeb/); looks like you got all the hard stuff right though
[10:11] <debe> hi
[10:11] <cjwatson> hello
[12:34] <thom> hrm, does partman-auto support mountoptions{ }? I assume so, but I'm lost in a maze of twisty directories
[12:34] <thom> :)
[14:06] <evand> ah, thanks
=== cjwatson1 is now known as cjwatson
[14:31] <cjwatson> evand: I'm dropping the bug references from the top entry in the partman-crypto changelog; I think it's generally best to leave out the bug numbers there since they can result in duplicate bug closures
[14:32] <evand> ah, I had thought it knew to skip those.  I'll make a note of that for the future.
[14:33] <cjwatson> I think it will normally skip them but if the bug was reopened due to not having really been fixed then this could lead to it accidentally being closed again
[14:34] <evand> ah, good point
[14:35] <cjwatson> uploaded, pushing branch to usual place
[14:36] <evand> fantastic, thanks
[14:36] <cjwatson> I think I'm up to date on your sponsorships now, let me know if not
[14:36] <evand> you are
[14:37] <cjwatson> good stuff
[16:31] <evand> cjwatson: worth it to update ubiquity to hardy components, or should it block on the new apt-setup?
[16:33] <cjwatson> I'd say do it now, it can be reuploaded later
[16:34] <evand> ok
[16:38] <CIA-4> ubiquity: evand * r2363 ubiquity/d-i/sources.list: gutsy->hardy
[16:46] <CIA-4> ubiquity: evand * r2364 ubiquity/ (d-i/manifest debian/changelog debian/control): (log message trimmed)
[16:46] <CIA-4> ubiquity: * Automatic update of included source packages: base-installer
[16:46] <CIA-4> ubiquity:  1.85ubuntu2, choose-mirror 2.19ubuntu1, clock-setup 0.92ubuntu1,
[16:46] <CIA-4> ubiquity:  console-setup 1.19ubuntu1, debian-installer-utils 1.49ubuntu1, grub-
[16:46] <CIA-4> ubiquity:  installer 1.27ubuntu1, hw-detect 1.58ubuntu1, kboot-installer
[16:46] <CIA-4> ubiquity:  0.0.1ubuntu6, localechooser 1.42ubuntu1, partconf 1.24, partman-auto
[16:46] <CIA-4> ubiquity:  70ubuntu1, partman-base 111ubuntu1, partman-basicfilesystems
[16:53] <evand> and here I was hoping to get CIA-4 kicked for excess flood.  It seems he's smarter than that.
[16:55] <CIA-4> ubiquity: evand * r2365 ubiquity/debian/po/ (79 files): debconf-updatepo
[17:09] <cjwatson> apparently old ubiquity actually installs fine (#ubuntu-devel)
[17:09] <cjwatson> wasn't expecting that
[17:10] <evand> yeah, it did for me as well
[17:10] <evand> though I didn't check the sources.list
[17:10] <evand> as I was just doing it to make sure it didn't explode when I updated the d-i components
[17:10] <evand> erm, to make sure it worked before I did that step, that is
[17:20] <CIA-4> ubiquity: evand * r2366 ubiquity/debian/changelog: releasing version 1.7.0
[17:22] <evand> cjwatson: Whenever you have a moment, please sponsor http://people.ubuntu.com/~evand/upload/ubiquity_1.7.0.dsc
[17:33] <thom> bah, guess partman-auto doesn't cope with mountoptions :(
[17:34] <cjwatson> thom: it does, the syntax is different though
[17:34] <cjwatson> I think you have to do mountoptions/noatime{ }
[17:34] <cjwatson> etc.
[17:35] <cjwatson> hmm, no, not quite that
[17:35] <cjwatson> options/noatime{ } I think
[17:36] <cjwatson> ubiquity uploaded
[17:36] <evand> thanks
[17:36] <cjwatson> thom: sorry, I'd missed your question earlier
[17:36] <thom> cjwatson: no worries
[17:36] <thom> thanks
[17:37] <thom> that's remarkably odd syntax :)
[17:38] <cjwatson> recipe syntax exactly mirrors the structure of /var/lib/partman/devices/
[17:38] <cjwatson> hence the oddness
[17:38] <thom> ahah!
[17:38] <thom> thanks
[18:02] <evand> uh oh
[18:02] <cjwatson> ?
[18:03] <evand>  /usr/lib/ubiquity/clock-setup/clock-setup: 35: tzsetup not found
[18:04] <cjwatson> whoops
[18:08] <cjwatson> yeah, tzsetup no longer provides a menu item and clock-setup calls it instead
[18:09] <evand> hrm
[18:09] <cjwatson> that's, err, sort of tricky
[18:09] <cjwatson> maybe for now sed clock-setup.postinst to comment out the tzsetup call and figure it out later?
[18:10] <evand> yeah, I noticed
[18:10] <evand> we have scripts/tzsetup
[18:10] <cjwatson> I think it needs some thought about what order to do everything in, since we call tzsetup way earlier
[18:10] <cjwatson> right
[18:10] <cjwatson> if it's calling tzsetup at all, it should be sedded to call that
[18:10] <cjwatson> you could try making it call that and see if it works?
[18:10] <evand> will do
[18:10] <cjwatson> so s,tzsetup,/usr/share/ubiquity/tzsetup,
[18:11] <cjwatson> probably won't work well though, since that resets the timezone
[18:11] <cjwatson> so doing that from clock-setup will lose the timezone configured earlier, unless you stash it in the component and shove it back in
[18:12] <cjwatson> might work better without calling tzsetup from clock-setup at all
[18:13] <evand> ok, I'll try both
[18:13] <evand> well
[18:13] <evand> I'll do it without calling tzsetup first
[18:52] <evand> cjwatson: http://pastebin.ubuntu.com/2362/ - look ok to you?
[18:52] <evand> I've already tested it.
[18:52] <cjwatson> looks correct for what it does, if it works, go for it
[18:52] <evand> fantastic
[18:54] <CIA-4> ubiquity: evand * r2367 ubiquity/ (configure configure.ac): bump to 1.7.1
[18:58] <CIA-4> ubiquity: evand * r2368 ubiquity/debian/ (changelog rules):
[18:58] <CIA-4> ubiquity: * clock-setup in d-i now explicitly calls tzsetup, but we handle tzsetup
[18:58] <CIA-4> ubiquity:  earlier on, so remove the tzsetup call in clock-setup.
[19:08] <CIA-4> ubiquity: evand * r2369 ubiquity/debian/changelog: releasing version 1.7.1
[19:11] <evand> cjwatson: http://people.ubuntu.com/~evand/upload/ubiquity_1.7.1.dsc whenever you have a moment.
[19:16] <cjwatson> uploading, thanks
[19:16] <evand> thank you