finish: also populate these variables even when blank

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
10 years ago · 1e33b883ad
parent f4bb2dd128
commit 1e33b883ad
2 changed files with 30 additions and 6 deletions
--- 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}
+else
+	echo "optargs=" >>  ${wfile}
+fi
+
 if [ ! "x${video}" = "x" ] ; then
 	echo "cmdline=video=${video}" >>  ${wfile}
+else
+	echo "cmdline=" >>  ${wfile}
 fi
-fi
-
 #
--- 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}
+else
+	echo "optargs=" >>  ${wfile}
+fi
+
 if [ ! "x${video}" = "x" ] ; then
 	echo "cmdline=video=${video}" >>  ${wfile}
+else
+	echo "cmdline=" >>  ${wfile}
 fi
-fi
-
 #