From 0a4e001cff82adae42c18a411e54dbeba6a9a206 Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Tue, 31 Oct 2017 08:48:37 -0400
Subject: [PATCH] Support auto mount hugetlbfs

This PS modify ks file to support auto mount hugetlbfs during
OS startup if hugepage is enabled by Daisy.

This PS also add transparent_hugepages=never alonge with
hugepagesz, hugepages kernel parameters, according to [1].

[1] https://docs.openstack.org/nova/pike/admin/huge-pages.html

Change-Id: Ic236ac785a16544c62c27ad59fb68c08371f7627
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
 code/pxe_server_install/pxe_install/pxe/pxe_kickstart.cfg | 1 +
 code/pxe_server_install/pxe_install/scripts/setup_func.sh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/pxe_server_install/pxe_install/pxe/pxe_kickstart.cfg b/code/pxe_server_install/pxe_install/pxe/pxe_kickstart.cfg
index f27c4930..c4fa361d 100755
--- a/code/pxe_server_install/pxe_install/pxe/pxe_kickstart.cfg
+++ b/code/pxe_server_install/pxe_install/pxe/pxe_kickstart.cfg
@@ -182,6 +182,7 @@ tmpline=`uuidgen`
 tmpline=`echo $tmpline|tr -d '-'`
 echo "$tmpline"> /etc/hostname
 
+#fstab_hugetlbfs_place_holder
 
 #lv_glance_nomount
 #end lv_glance_nomount
diff --git a/code/pxe_server_install/pxe_install/scripts/setup_func.sh b/code/pxe_server_install/pxe_install/scripts/setup_func.sh
index 05585977..e3f50262 100755
--- a/code/pxe_server_install/pxe_install/scripts/setup_func.sh
+++ b/code/pxe_server_install/pxe_install/scripts/setup_func.sh
@@ -466,7 +466,8 @@ function custom_ks_hugepages
         [[ $sizes == "" ]] && sizes="1G"
         [[ $sizes != "1G" && $sizes != "2M" ]] && { pxelog "[error]hugepagesize value error($sizes)" "console"; return 1; }
 
-        sed -i "s/#bootloader_append_hugepage_place_holder/bootloader --append=\"intel_iommu=on iommu=pt default_hugepagesz=${sizes} hugepagesz=${sizes} hugepages=${pages}\"/g" $KS_FILE
+        sed -i "s/#bootloader_append_hugepage_place_holder/bootloader --append=\"intel_iommu=on iommu=pt transparent_hugepage=never default_hugepagesz=${sizes} hugepagesz=${sizes} hugepages=${pages}\"/g" $KS_FILE
+        sed -i "s/#fstab_hugetlbfs_place_holder/echo \"hugetlbfs /dev/hugepages hugetlbfs defaults 0 0\" >> /etc/fstab/g" $KS_FILE
     fi
 
     pxelog "end custom_ks_hugepages ${sizes}, ${sizes}\n"