extend DATA, SDCARD syntax

diff --git a/boot/isolinux/isolinux.cfg b/boot/isolinux/isolinux.cfg
index 4d094b7..33d7d2e 100644 (file)
--- a/boot/isolinux/isolinux.cfg
+++ b/boot/isolinux/isolinux.cfg
@@ -15,12 +15,12 @@ menu color hotkey 7 #ffffffff #ff000000
 label live
        menu label Live CD - Run Android without installation
        kernel /kernel
-       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc quiet
+       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc quiet SRC= DATA= SDCARD=
 
 label vesa
        menu label Live CD - VESA mode
        kernel /kernel
-       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc vga=788 quiet
+       append initrd=/initrd.img root=/dev/ram0 androidboot.hardware=eeepc vga=788 quiet SRC= DATA= SDCARD=
 
 label debug
        menu label Live CD - Debug mode

diff --git a/initrd/init b/initrd/init
index 2c4e9ff..d42b077 100755 (executable)
--- a/initrd/init
+++ b/initrd/init
@@ -68,19 +68,29 @@ ln -s android/system /
 
 ln -s ../system/lib/modules /lib
 
-if [ -n "$DATA" ]; then
+if [ -b "$DATA" ]; then
        mount $DATA data
+elif [ -b "/dev/$DATA" ]; then
+       mount /dev/$DATA data
 elif [ -d /mnt/$SRC/data ]; then
        mount --bind /mnt/$SRC/data data
 else
        mount -t tmpfs tmpfs data
 fi
-if [ -n "$SDCARD" ]; then
+if [ -b "$SDCARD" ]; then
        mount $SDCARD sdcard
-elif [ -d /mnt/$SRC/sdcard ]; then
-       mount --bind /mnt/$SRC/sdcard sdcard
+elif [ -b "/dev/$SDCARD" ]; then
+       mount /dev/$SDCARD sdcard
+elif [ -n "$SDCARD" ]; then
+       # TODO: SDCARD is specified but does not exist.
+       # Set it to mountd.conf
+       echo $SDCARD
 else
-       mount -t tmpfs tmpfs sdcard
+       if [ -d /mnt/$SRC/sdcard ]; then
+               mount --bind /mnt/$SRC/sdcard sdcard
+       else
+               mount -t tmpfs tmpfs sdcard
+       fi
 fi
 
 # load scripts