From b22e1550c23cea2245b33d65e5ede237de4680cf Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 16 Jun 2013 15:06:29 +0200
Subject: [PATCH] [scripts] properly setup /boot fstab for the Efika MX, Odroid
 and Raspi

---
 scripts/mkloopcard_chroot.include              | 9 ++++++++-
 scripts/mkloopcard_efikamx_chroot_hook.sh      | 8 +-------
 scripts/mkloopcard_odroid_u2_x2_chroot_hook.sh | 1 +
 scripts/mkloopcard_raspberry_chroot_hook.sh    | 1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/mkloopcard_chroot.include b/scripts/mkloopcard_chroot.include
index 71cc791..f10dff4 100644
--- a/scripts/mkloopcard_chroot.include
+++ b/scripts/mkloopcard_chroot.include
@@ -44,6 +44,13 @@ setup_desktop_environment() {
     fi
 }
 
+setup_bootfs_fstab() {
+	# add /dev/mmcblk0p1 to /etc/fstab
+	local boot_part_type="${1}"
+	echo "/dev/mmcblk0p1  /boot  ${boot_part_type}  defaults  0 2" >> /etc/fstab
+}
+
+
 setup_boot() {
     sd_enable sshd
     sd_enable vixie-cron
@@ -68,4 +75,4 @@ setup_users() {
         # also add "sabayon" to disk group
         usermod -a -G disk sabayon
     ) || return 1
-}
\ No newline at end of file
+}
diff --git a/scripts/mkloopcard_efikamx_chroot_hook.sh b/scripts/mkloopcard_efikamx_chroot_hook.sh
index 2fcc8ea..10d2494 100755
--- a/scripts/mkloopcard_efikamx_chroot_hook.sh
+++ b/scripts/mkloopcard_efikamx_chroot_hook.sh
@@ -8,17 +8,11 @@
 
 . /mkloopcard_chroot.include || exit 1
 
-setup_fstab() {
-    # add /dev/mmcblk0p1 to /etc/fstab
-    local boot_part_type="${BOOT_PART_TYPE:-ext3}"
-    echo "/dev/mmcblk0p1  /boot  ${boot_part_type}  defaults  0 1" >> /etc/fstab
-}
-
 setup_displaymanager
 setup_desktop_environment
 setup_users
 setup_boot
-setup_fstab
+setup_bootfs_fstab "ext3"
 
 # We need OpenRC due to the old kernel
 eselect init set sysvinit
diff --git a/scripts/mkloopcard_odroid_u2_x2_chroot_hook.sh b/scripts/mkloopcard_odroid_u2_x2_chroot_hook.sh
index adf8056..03f08b7 100755
--- a/scripts/mkloopcard_odroid_u2_x2_chroot_hook.sh
+++ b/scripts/mkloopcard_odroid_u2_x2_chroot_hook.sh
@@ -9,5 +9,6 @@ setup_displaymanager
 setup_desktop_environment
 setup_users
 setup_boot
+setup_bootfs_fstab "vfat"
 
 exit 0
diff --git a/scripts/mkloopcard_raspberry_chroot_hook.sh b/scripts/mkloopcard_raspberry_chroot_hook.sh
index d633746..5045256 100755
--- a/scripts/mkloopcard_raspberry_chroot_hook.sh
+++ b/scripts/mkloopcard_raspberry_chroot_hook.sh
@@ -7,5 +7,6 @@
 
 setup_boot
 setup_users
+setup_bootfs_fstab "vfat"
 
 exit 0