diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 11cfc7d94d3d4fef04daf1db1a1c5b626cec45a7..e866829c1ce4c1c225f9cd58ce915615585c6404 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -152,14 +152,16 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 		EOF
 		chmod +x /usr/sbin/policy-rc.d
 
+		unset deb_pkgs
 		dpkg -l | grep lsb-release >/dev/null || deb_pkgs+="lsb-release "
 
-		if [ "${deb_pkgs}" ] ; then
-			apt-get -y --force-yes install ${deb_pkgs}
+		if [ "\${deb_pkgs}" ] ; then
+			apt-get -y --force-yes install \${deb_pkgs}
 		fi
-		distro="$(lsb_release -si)"
 
-		if [ "x${distro}" = "xUbuntu" ] ; then
+		distro="\$(lsb_release -si)"
+
+		if [ "x\${distro}" = "xUbuntu" ] ; then
 			dpkg-divert --local --rename --add /sbin/initctl
 			ln -s /bin/true /sbin/initctl
 		fi
@@ -175,9 +177,11 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	}
 
 	git_firmware () {
+		unset deb_pkgs
 		dpkg -l | grep git-core >/dev/null || deb_pkgs+="git-core "
-		if [ "${deb_pkgs}" ] ; then
-			apt-get -y --force-yes install ${deb_pkgs}
+
+		if [ "\${deb_pkgs}" ] ; then
+			apt-get -y --force-yes install \${deb_pkgs}
 		fi
 
 		git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git /tmp/linux-firmware
@@ -214,7 +218,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 
 		rm -f /usr/sbin/policy-rc.d
 
-		if [ "x${distro}" = "xUbuntu" ] ; then
+		if [ "x\${distro}" = "xUbuntu" ] ; then
 			rm -f /sbin/initctl || true
 			dpkg-divert --local --rename --remove /sbin/initctl
 		fi
@@ -225,11 +229,11 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	install_pkg_updates
 	install_pkgs
 
-	if [ "x${chroot_ENABLE_FIRMWARE}" = "xenable" ] ; then
+	if [ "x\${chroot_ENABLE_FIRMWARE}" = "xenable" ] ; then
 		git_firmware
 	fi
 
-	if [ "x${chroot_ENABLE_DEB_SRC}" = "xenable" ] ; then
+	if [ "x\${chroot_ENABLE_DEB_SRC}" = "xenable" ] ; then
 		dl_pkg_src
 	fi