Help deleting old linux partitions!

[stelmate]

I had installed linux using boot camp awhile back, now I need to reinstall windows but don't want to mess up my old HFS partition. So have 3 partitions nows..
my original HFS (that OSX is on)
1 FAT partition that housed linux
1 linux swap partition.

How do I erase both the FAT partition and the linux swap and put that empty space back into my original HFS parition? I tried doing a diskutil resizeVolume but that just complains. I tried to run boot camp assistant but it complains about not having a single volume on my disk. Any help would be much appreciated.

 

[stelmate]

I had installed linux using boot camp awhile back, now I need to reinstall windows but don't want to mess up my old HFS partition. So have 3 partitions nows..
my original HFS (that OSX is on)
1 FAT partition that housed linux
1 linux swap partition.

How do I erase both the FAT partition and the linux swap and put that empty space back into my original HFS parition? I tried doing a diskutil resizeVolume but that just complains. I tried to run boot camp assistant but it complains about not having a single volume on my disk. Any help would be much appreciated.

If anyone else if having this problem :
http://jepstone.net/blog/?p=591

The only difference is that if you use the install disk you have and the resize tool didn't work for me so I used
gpt add -s [size of free space] windows disk0

also be prepared, I had to unmount the disk using disk utility EVERY time I used a gpt command.