Bug#785345: live-boot nodhcp still dhcp

[Frank Lillo <frank.lillo@gecoinc.com>]

Package: live-boot
Version: 4.0.2-1

When I boot with nodhcp and I am not netbooting, dhcp is still setup.
Please updated the following two scripts:

9990-netbase.sh

FROM
if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
then
        # default, dhcp assigned
        method="dhcp"
else
        # make sure that the preconfigured interface would not get reassigned by dhcp
        # on startup by ifup script - otherwise our root fs might be disconnected!
        method="manual"
fi

TO
if [ -n "${NODHCP}" ]
then
        # when nodhcp is desired, use manual method
        method="manual"
elif [ -n "${NETBOOT}" ] && [ -z "${DHCP}" ]
then
        # make sure that the preconfigured interface would not get reassigned by dhcp
        # on startup by ifup script - otherwise our root fs might be disconnected!
        method="manual"
else
        # default, dhcp assigned
        method="dhcp"
fi

9990-cmdline-old.sh
FROM
			nodhcp)
		DHCP=""
		export DHCP
		;;
TO
			nodhcp)
		NODHCP="true"
		export NODHCP
		;;

I am using Debian GNU/Linux 8.0 RC1, kernel 3.16.0-4-686-pae.