--- initrd/init	2008-03-26 02:12:10.000000000 +0000
+++ newinitrd/init	2008-03-26 01:28:46.000000000 +0000
@@ -16,11 +16,11 @@
 fi
 
 if [ -n "$XANDROSSCAN" ]; then
-    exec switch_root /mnt-system /sbin/scanuser.sh
+    exec switch_root /mnt-system /sbin/eeecryptscanuser.sh
 fi
 
 if [ -n "$XANDROSRESTORE" ]; then
-    exec switch_root /mnt-system /sbin/formatuser.sh
+    exec switch_root /mnt-system /sbin/eeecryptformatuser.sh
 fi
 
 if [ -z "`grep nosplash /proc/cmdline`" ]; then
@@ -28,17 +28,22 @@
     cp /mnt-system/boot/startup.fb /dev/fb/0
 fi
 
-if ! mount -t ext3 -o rw /dev/sda2 /mnt-user; then
+# Link some stuff through to the system partition,
+# so we can run dynamic binaries
+ln -s /mnt-system/lib /
+ln -s /mnt-system/usr /
+
+# Symlink fusermount too, as it's needed internally
+ln -s /mnt-system/usr/bin/fusermount /bin
+
+insmod /mnt-system/lib/modules/$VERSION/kernel/fs/fuse/fuse.ko
+
+if ! truecrypt -k "" --protect-hidden=no /dev/sda2 /mnt-user; then
     echo Error mounting user partition. Must run filesystem scan!
-    exec switch_root /mnt-system /sbin/scanuser.sh
+    #exec switch_root /mnt-system /sbin/scanuser.sh
+    /bin/busybox sh
 fi 
 
-# Factory auto-format functionality
-if [ -f /mnt-user/.autoformat ]; then
-    umount /mnt-user
-    exec switch_root /mnt-system /sbin/formatuser.sh -- --auto
-fi
-
 #insmod /mnt-system/lib/modules/$VERSION/kernel/fs/unionfs/unionfs.ko > /dev/null
 
 mount -t unionfs -o dirs=/mnt-user=rw:/mnt-system=ro unionfs /mnt