Bug#387808: initramfs-tools: patch to fix when root-path includes server-ip

[Vagrant Cascadian <vagrant+debianbugs@freegeek.org>]

Package: initramfs-tools
Version: 0.85g
Followup-For: Bug #387808

think i've finally tracked this one down, unfortunately not in time for
etch... *sigh*

the problem was that when NFSROOT=auto, it assumed you always needed to
add the server ip. i grabbed the git branch:

git clone git://git.debian.org/git/kernel/initramfs-tools.git

and made this patch:

--- a/scripts/nfs
+++ b/scripts/nfs
@@ -41,7 +41,11 @@ do_nfsmount()
 
        # get nfs root from dhcp
        if [ "x${NFSROOT}" = "xauto" ]; then
-               NFSROOT=${ROOTSERVER}:${ROOTPATH}
+               if [ "${ROOTPATH#*:}" = "${ROOTPATH}" ]; then
+                       NFSROOT=${ROOTSERVER}:${ROOTPATH}
+               else
+                       NFSROOT=${ROOTPATH}
+               fi
        # nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
        elif [ -n "${NFSROOT}" ]; then
                # nfs options are an optional arg


with it you can specify the server ip as part of root-path with dhcp, so:

  option root-path "192.168.1.101:/opt/ltsp/i386";

or:

  option root-path "/opt/ltsp/i386";

both work as expected with dhcp3-server (and presumably other dhcp
servers).

with this patch, or something similar applied, i think we can finally
close this bug for real :)

live well,
  vagrant