Bug#774261: (pre-approval) unblock: debian-lan-config/0.19

["Andreas B. Mundt" <andi@debian.org>]

Control: tags -1 - moreinfo
Control: retitle -1 unblock: debian-lan-config/0.19

Hi Ivo,

On Wed, Dec 31, 2014 at 12:21:00AM +0100, Ivo De Decker wrote:
> On Tue, Dec 30, 2014 at 10:34:27PM +0100, Andreas B. Mundt wrote:
[...]
>
> > -DISTRI="$(sed s%/.*$%% ${target}/etc/debian_version)"
> > +DISTRI="stable"
>
> Wouldn't it be better to replace this with 'jessie' instead of 'stable'.
> That's what was there before. Also that will be correct now (before jessie is
> stable), after the release, and even after later releases (when jessie is
> oldstable).

Yes, indeed, but current di-netboot-assistant has only 'testing'
(that's what worked before the change in base-files).

However, taking a look at '/etc/di-netboot-assistant/di-sources.list',
I found that 'jessie' is available but commented out.  I added a sed
command now to enable it for the time being.
(Cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759424#72 )

> With the change mentioned above, please go ahead and remove the moreinfo tag
> from this bug once it's in unstable.

One minor trivial fix:  I added chain.c32 to the files copied to the
tftp installer directory, it's needed to make booting from the local
hard disk work.

I hope you are still happy with the debdiff attached below.

Thanks and best regards,

       Andi


$ debdiff debian-lan-config_0.18.dsc debian-lan-config_0.19.dsc

diff -Nru debian-lan-config-0.18/debian/changelog debian-lan-config-0.19/debian/changelog
--- debian-lan-config-0.18/debian/changelog	2014-12-05 14:04:45.000000000 +0100
+++ debian-lan-config-0.19/debian/changelog	2014-12-31 10:44:11.000000000 +0100
@@ -1,3 +1,11 @@
+debian-lan-config (0.19) unstable; urgency=medium
+
+  * Adapt to the format of '/etc/debian_version' (closes: #774035).
+  * Enable 'jessie' repositories for di-netboot-assistant.
+  * Preseed the grub installation and fix PXE-boot from the local disk.
+
+ -- Andreas B. Mundt <andi@debian.org>  Wed, 31 Dec 2014 10:38:21 +0100
+
 debian-lan-config (0.18) unstable; urgency=medium

   * Work around broken di-netboot-assistant only if necessary to avoid
diff -Nru debian-lan-config-0.18/fai/config/scripts/FAISERVER/50-di-netboot debian-lan-config-0.19/fai/config/scripts/FAISERVER/50-di-netboot
--- debian-lan-config-0.18/fai/config/scripts/FAISERVER/50-di-netboot	2014-12-05 14:04:45.000000000 +0100
+++ debian-lan-config-0.19/fai/config/scripts/FAISERVER/50-di-netboot	2014-12-31 10:44:11.000000000 +0100
@@ -2,10 +2,12 @@

 set -e

-DISTRI="$(sed s%/.*$%% ${target}/etc/debian_version)"
-
+DISTRI="jessie"

 if [ "$FAI_ACTION" == "install" ] || [ "$CONVERT" == "true" ] ; then
+    ## Enable jessie in di-netboot-assistant (FIXME #759424):
+    sed  -i "s/^#jessie/jessie/" ${target}/etc/di-netboot-assistant/di-sources.list
+
     cat >> "${target}/etc/di-netboot-assistant/pxelinux.HEAD" <<EOF
 LABEL Local Boot
        MENU LABEL Boot from local hard disk
@@ -88,8 +90,8 @@
 #tasksel tasksel/desktop multiselect kde, xfce
 # Individual additional packages to install
 d-i pkgsel/include string fai-client nfs-common aptitude
-### FIXME: GRUB default does not work: #712907 #759737
-
+### GRUB on default disk:
+d-i grub-installer/bootdev string default
 ### This command is run just before the install finishes, it does all the FAI magic:
 d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \\
        in-target modprobe nfsv4; \\
@@ -105,8 +107,8 @@
 $ROOTCMD di-netboot-assistant install $DISTRI --arch=i386
 $ROOTCMD di-netboot-assistant rebuild-menu

-# FIXME: Bug #759424
-for FILE in ldlinux.c32 libcom32.c32 libutil.c32 ; do
+# FIXME: Bug #759424; chain.c32 is needed to boot from the local hard disk.
+for FILE in ldlinux.c32 libcom32.c32 libutil.c32 chain.c32 ; do
     if [ ! -e $target/srv/tftp/debian-installer/$FILE ] ; then
         $ROOTCMD cp /usr/lib/syslinux/modules/bios/$FILE /srv/tftp/debian-installer/
     fi