From 1e33b883adfb9fdc2d17ced7bc458a6597884c02 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 1 Sep 2014 15:45:27 -0500 Subject: [PATCH] finish: also populate these variables even when blank Signed-off-by: Robert Nelson --- lib/debian-finish.sh | 18 +++++++++++++++--- lib/ubuntu-finish.sh | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index 280a4f1..f1dd7de 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -150,14 +150,26 @@ else fi echo "uuid=$(/sbin/blkid -c /dev/null -s UUID -o value ${FINAL_PART})" >> ${wfile} +echo "root=${FINAL_PART} ro" >> ${wfile} +echo "rootfstype=${FINAL_FSTYPE} fixrtc" >> ${wfile} +echo "cape_disable=" >> ${wfile} +echo "cape_enable=" >> ${wfile} + if [ ! "x${dtb}" = "x" ] ; then echo "dtb=${dtb}" >> ${wfile} +else + echo "dtb=" >> ${wfile} fi + if [ ! "x${optargs}" = "x" ] ; then echo "optargs=${optargs}" >> ${wfile} - if [ ! "x${video}" = "x" ] ; then - echo "cmdline=video=${video}" >> ${wfile} - fi +else + echo "optargs=" >> ${wfile} fi +if [ ! "x${video}" = "x" ] ; then + echo "cmdline=video=${video}" >> ${wfile} +else + echo "cmdline=" >> ${wfile} +fi # diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh index a696095..b959a39 100644 --- a/lib/ubuntu-finish.sh +++ b/lib/ubuntu-finish.sh @@ -120,14 +120,26 @@ else fi echo "uuid=$(/sbin/blkid -c /dev/null -s UUID -o value ${FINAL_PART})" >> ${wfile} +echo "root=${FINAL_PART} ro" >> ${wfile} +echo "rootfstype=${FINAL_FSTYPE} fixrtc" >> ${wfile} +echo "cape_disable=" >> ${wfile} +echo "cape_enable=" >> ${wfile} + if [ ! "x${dtb}" = "x" ] ; then echo "dtb=${dtb}" >> ${wfile} +else + echo "dtb=" >> ${wfile} fi + if [ ! "x${optargs}" = "x" ] ; then echo "optargs=${optargs}" >> ${wfile} - if [ ! "x${video}" = "x" ] ; then - echo "cmdline=video=${video}" >> ${wfile} - fi +else + echo "optargs=" >> ${wfile} fi +if [ ! "x${video}" = "x" ] ; then + echo "cmdline=video=${video}" >> ${wfile} +else + echo "cmdline=" >> ${wfile} +fi #