rosa
- MySQL
- Master Backend
- No capture card
- Has storage group 'Default' pointing to /red, my big disk array.

zeetha
- Slave Backend
- Pinnacle PCTV 800i HD capture card (CX23883 based?)
- NFS mounts /red from rosa (I don't think this is used in any way)
- Has storage group 'Default' pointing to /var/lib/mythtv, local disk.
---- I may ditch this idea, I can't figure out if it works well or not.

azraelle
- Slave Backend
- Hauppauge WinTV PVR-150 capture card
- NFS mounts /red from rosa (I hope this isn't used directly, I need to check)
- No storage groups defined
- Also runs frontend!

mora
- Frontend
- NFS mounts /red from rosa... older files (prior to about march 2008) don't play unless /red is mounted, they seem to lack mythtv:// urls to reach them... dunno.

Special notes:

All of my machines are set to be in UTC. To compensate for this I have to run mythtv-backend and mythtv-frontend with TZ=America/Los_Angeles set during startup. No adjustments of MySQL are necessary.

Version 1.03d       ------Sequential Output------ --Sequential Input- --Random-
                    -Per Chr- --Block-- -Rewrite- -Per Chr- --Block-- --Seeks--
Machine        Size K/sec %CP K/sec %CP K/sec %CP K/sec %CP K/sec %CP  /sec %CP
rosa          1536M 32771  84 42465  20 18916   1 36628  63 46241   0 284.6   0
                    ------Sequential Create------ --------Random Create--------
                    -Create-- --Read--- -Delete-- -Create-- --Read--- -Delete--
              files  /sec %CP  /sec %CP  /sec %CP  /sec %CP  /sec %CP  /sec %CP
                 16 +++++ +++ +++++ +++ +++++ +++ +++++ +++ +++++ +++ +++++ +++
rosa,1536M,32771,84,42465,20,18916,1,36628,63,46241,0,284.6,0,16,+++++,+++,+++++,+++,+++++,+++,+++++,+++,+++++,+++,+++++,+++

Version 1.03d       ------Sequential Output------ --Sequential Input- --Random-
                    -Per Chr- --Block-- -Rewrite- -Per Chr- --Block-- --Seeks--
Machine        Size K/sec %CP K/sec %CP K/sec %CP K/sec %CP K/sec %CP  /sec %CP
debian           4G 27487  70 30086  12 13044   0 25357  42 27272   0 143.8   0
                    ------Sequential Create------ --------Random Create--------
                    -Create-- --Read--- -Delete-- -Create-- --Read--- -Delete--
              files  /sec %CP  /sec %CP  /sec %CP  /sec %CP  /sec %CP  /sec %CP
                 16 +++++ +++ +++++ +++ +++++ +++ +++++ +++ +++++ +++ +++++ +++
debian,4G,27487,70,30086,12,13044,0,25357,42,27272,0,143.8,0,16,+++++,+++,+++++,+++,+++++,+++,+++++,+++,+++++,+++,+++++,+++

start snmpd again...

remove line if still there.

yomiko - work macintosh
nenene - work desktop
miyako - work laptop

shego - server in San Francisco, CA, USA
sachiko - server in London, UK
florence - server in Dallas, TX, USA

rosa - server in closet at home
lina - mac mini at home
azraelle - frontend at home
zeetha - backend at home

Delphine Angua von Überwald - Cell phone
matilda - Pocket computer

tabitha - Cisco catalyst 2950 at home
haru - Linksys WRT-54GL
juna - Carputer

DateTime - Roughly speaking, the earliest of file mtime, EXIF original creation, and other similar tags.
Location - User tagging, or possibly even GPS location in the EXIF tags

EXIF tags - Data comes from the camera and describes many aspects of how the picture was taken.
User tags - Three forms?

BADGERS (bare tag?)
LOCATION=singapore (valued)
PERSON=rob PERSON=rose (multivalued?)

This seems klunky, and what the hell are bare tags for?

Maybe something more like tag sections

First pass on a photo you can just list tags

Badgers, Singapore, Rob, Rose

The system then can attempt to recognize and parse tags into sections based on other data

Badgers, Location:Singapore, Person:Rob, Person:Rose

Then I run into the problem of equivalent tags

Location: SFO and Location: San Francisco should be semantically the same thing for searching

While reading /proc/net/if_inet6 net-snmp uses:

rc = sscanf(line, "%39s %02x %02x %02x %02x %8s\n",
addr, &if_index, &pfx_len, &scope, &flags, if_name);

to read the input, but on linux interfaces can currently be up to 16 characters in length.

The result of which was errors like:

Feb 27 22:45:09 rosa snmpd[6082]: ioctl 35123 returned -1

many times in logs.

I have reported this bug towards upstream via the debian bug tracking system at: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468260

Patch is at: http://hachi.kuiki.net/bug_reports/snmpd.patch


$ gcc -v
Reading specs from /usr/lib/gcc/powerpc-apple-darwin8/4.0.0/specs
Configured with: /private/var/tmp/gcc/gcc-4061.obj~8/src/configure --disable-checking --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^+.-]*$/s/$/-4.0/ --with-gxx-include-dir=/include/gcc/darwin/4.0/c++ --build=powerpc-apple-darwin8 --host=powerpc-apple-darwin8 --target=powerpc-apple-darwin8
Thread model: posix
gcc version 4.0.0 20041026 (Apple Computer, Inc. build 4061)



$ cat iter.sh
#!/bin/sh

:100644 100644 e12b428c0a76a635041f678a3eaf05300d780061 7a08a0c64f9f447e09ef6771d83dbf95f8f3545d M parse-options.c
:040000 040000 97d205cf36b2a3f2521726b510fb37096b60e5dc fcd2f25cef31e362d755a91c5f5dc181169ce5ff M t
bisect run success


The problem


/code/conf/*
/code/src/*
/code/modules/*


The commit history of this part is uninteresting...

master <---- HEAD
... 20 revisions
(unnamed) <---- initial commit
And a remote repo to mine with a directory structure that looks like:


/conf/*
/src/*
/modules/*


Now, the revision history of this second one is barely interesting:

remotes/floot/master <----- HEAD
... 10 revisions
remotes/floot/alpha <---- arbitrary branch ref
... 130 or so revisions
remotes/floot/release-1-2-1 <---- nearest point to 'merge' from
... some uncounted number of commits
(unnamed) <---- initial commit

Now, the initial commit on master, and remotes/floot/release-1-2-1 are still about 2000 lines in difference.

My goal is to make these two histories join together.

I would like to try and make git resolve as much as it can for me and present me with what I need to merge manually as a set of (or a single) conflict.

OR I'm happy to hear a different method that may be the correct action for me... but I'm not used to merging in any way other than 'manually'. So I'm not sure how much git can help me.

First attempt

Second attempt


$ git remote add -f floot /path/to/floot
$ git merge -s ours --no-commit floot/alpha
Automatic merge went well; stopped before committing as requested
$ git read-tree --prefix=code/ -u floot/alpha
fatal: subdirectory 'code/' already exists.


Third attempt

# Show all attributes (including operational)
ldapsearch -x "objectclass=*" +

US

850 GSM
1900 GSM
2100 Digital Satellite (TV/Internet delivery)

Europe/Asia

900 GSM
1800 GSM
2100 UMTS/WCDMA