[PROBLEM] XBian Transfer to larger card

[palswim]

Software
XBian version: 1.0 Beta 2
XBMC version: default
Overclock settings: default

Hardware
Power supply rating: 500mA
RPi model (model A/B 256mb/512mb): Model B
SD card size and make/type: 2 GB (and 4 GB) MicroSD with adapter
Network (wireless or LAN): LAN
Connected devices (TV, USB, network storage, etc.): USB hub with USB hard drive

I tried to use the XBian copier tool to create an image file (to "file:/a/path") to write to a new SD card, but it seemed to fail after creating 1 GiB of data. Perhaps I will open a thread for that, but I mention this just to explain my reasons for using the alternate methods I will describe.

Since I couldn't create an image of my currently running XBian system, I eventually caved in and powered off the system, and extracted the current SD card image with Win32 Disk Imager. Then, I wrote this image to the new SD card. I had already seen the notification in the Resize SD option saying "Resize is automatically provided by initramfs helpers.", so I figured that my Pi would resize the partitions in the new SD card at boot. But, it didn't resize the image at all.

After a bit of research, I thought that the swap partition (/dev/mmcblkp3) after the main partition (/dev/mmcblk0p2) was causing the resize to fail, so I deleted that partition and rebooted. Unfortunately, things started to get screwy here. I noticed that not only was the Pi not resizing the SD card, the space in the main partition was vanishing, as if XBian was trying to use the main partition for swap space, too. Using df -h, I started to see things like

Code:

Filesystem      Size  Used Avail Use% Mounted on
/dev/mmcblk0p2  1.7G  1.4G   73M  96% /

The "available" space would steadily decrease until I would see

Code:

Filesystem      Size  Used Avail Use% Mounted on
/dev/mmcblk0p2  1.7G  1.4G    0M 100% /

Every time I would reboot, I would again see a small amount of free space that was diminishing slowly to none.

At this time, running XBian on the larger card, but seeing these issues, I tried to resize the partition from within XBian, with both parted and xbian-resize, but neither would successfully resize the partition. Tab completion stopped working, but I was able to create a new swap partition and run mkswap and reboot, and that left my installation with something stable along the lines of:

Code:

Filesystem      Size  Used Avail Use% Mounted on
/dev/mmcblk0p2  1.7G  1.1G  345M  77% /

I would like to know how to resize my partition to fill the extra space I have, and also how to reconcile the discrepancy between my used and available space.