4 files changed, 24 insertions, 16 deletions
diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall
index 62ab3225a..b9b0e3109 100644
--- a/package/adkinstall/src/adkinstall
+++ b/package/adkinstall/src/adkinstall
@@ -52,11 +52,18 @@ if [ $rescue -eq 1 ];then
 	rootp=3
 	cfgfsp=4
 	start=2
-	parted -s /dev/sda unit cyl mkpartfs primary ext2 0 1
-	parted -s /dev/sda unit cyl mkpartfs primary ext2 1 2
+	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
+	check_exit
+	mke2fs /dev/sda1
+	check_exit
+	parted -s /dev/sda unit cyl mkpart primary ext2 1 2
+	check_exit
+	mke2fs /dev/sda2
 	check_exit
 fi
-parted -s /dev/sda unit cyl mkpartfs primary ext2 $start $rootsize
+parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
+check_exit
+mke2fs /dev/sda1
 check_exit
 parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
 check_exit
@@ -124,7 +131,7 @@ menuentry "GNU/Linux (OpenADK)" {
 	recordfail
         insmod ext2
         set root=(hd0,3)
-        linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10
+        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
 }
 
 menuentry "GNU/Linux (OpenADK) Rescue Mode" {
@@ -145,7 +152,7 @@ terminal_input serial
 menuentry "GNU/Linux (OpenADK)" {
         insmod ext2
         set root=(hd0,1)
-        linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10
+        linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10
 }
 EOF
 fi
diff --git a/package/adkinstall/src/adkinstall.foxg20 b/package/adkinstall/src/adkinstall.foxg20
index 4b0251309..61ab65d9d 100644
--- a/package/adkinstall/src/adkinstall.foxg20
+++ b/package/adkinstall/src/adkinstall.foxg20
@@ -17,7 +17,7 @@ parted -s /dev/mmcblk0 mklabel msdos
 sleep 2
 maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
 rootsize=$(($maxsize-2))
-parted -s /dev/mmcblk0 unit cyl mkpartfs primary fat32 0 5
+parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5
 parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize
 parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize
 parted -s /dev/mmcblk0 set 1 boot on
@@ -25,6 +25,7 @@ sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1
 sleep 2
 sync
 printf "Creating ext2 filesystem\n"
+mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1
 mke2fs /dev/mmcblk0p2 >/dev/null 2>&1
 tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1
 mount -t ext2 /dev/mmcblk0p2 /mnt
diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx
index f96cc7f05..afaea0c39 100644
--- a/package/adkinstall/src/adkinstall.rb4xx
+++ b/package/adkinstall/src/adkinstall.rb4xx
@@ -1,6 +1,5 @@
 #!/bin/sh
-# installs a rootfs tar archive from OpenADK onto 
-# a NAND device
+# installs a rootfs tar archive from OpenADK onto a NAND device
 # special script for routerboard rb4xx
 
 if [ -z $1 ];then
diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532
index e71848325..9f1af0bb6 100644
--- a/package/adkinstall/src/adkinstall.rb532
+++ b/package/adkinstall/src/adkinstall.rb532
@@ -14,12 +14,6 @@ if [ -z $2 ];then
         printf "Please give your root tar archive as second parameter\n"
         exit 1
 fi
-if [ $cfinstall -eq 1 ];then
-	if [ -z $3 ];then
-       	 printf "Please give your kernel as third parameter\n"
-       	 exit 1
-	fi
-fi
 case $1 in
 	nand)
 		nandinstall=1
@@ -34,6 +28,13 @@ case $1 in
 esac
 
 if [ $cfinstall -eq 1 ];then
+	if [ -z $3 ];then
+       	 printf "Please give your kernel as third parameter\n"
+       	 exit 1
+	fi
+fi
+
+if [ $cfinstall -eq 1 ];then
 	# create empty partition table
 	printf "Creating partition scheme\n"
 	parted -s /dev/sda mklabel msdos
@@ -41,12 +42,13 @@ if [ $cfinstall -eq 1 ];then
 	maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//')
 	rootsize=$(($maxsize-2))
 	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
-	parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize
+	parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize
 	parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
 	parted -s /dev/sda set 1 boot on
 	sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1
 	sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1
 	sleep 2
+	mke2fs /dev/sda2
 	sync
 	printf "Installing kernel\n"
 	dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1
@@ -71,7 +73,6 @@ fi
 
 chmod 1777 /mnt/tmp
 chmod 4755 /mnt/bin/busybox
-
 sync
 
 if [ $nandinstall -eq 1 ];then