Bug#786863: jessie-pu: package debian-lan-config/0.19
Control: tags -1 - moreinfo
Hi Adam,
thank you for thorough review. I worked through the changelog again:
On Tue, May 26, 2015 at 01:10:26PM +0100, Adam D. Barratt wrote:
> On 2015-05-26 9:05, Andreas B. Mundt wrote:
[...]
> >* Workarounds: #759424 (di-n-a) removed, #774033 (deadlock) added.
> > [di-netboot-assistant finally made it to jessie, but problems with
> > NFS4 and the live system could not be solved -> switch back to NFS3
> > here]
>
> The changelog entry for the latter could do with being much more detailed.
> (It doesn't mention nfs at all, for one thing.)
I reworked this changelog entry and added the details.
[...]
> >* Describe how to use an arbitrary hostname for the 'mainserver'.
> >* Add libcgi-fast-perl to make the zoom in munin work. [Some packages
> > have been removed from jessie, this one is needed in addition.]
>
> That last change doesn't appear to have been made in the unstable package
> (0.20)
Indeed, I just uploaded 0.21 with the fix included to unstable (accepted).
> There are other changes, which don't appear to be mentioned:
>
> -adzapper
> +
> +## FIXME #722717
> +#adzapper
[...]
OK, the explanation (package has been removed from jessie) has been
added.
> What are these about?
>
> -# FIXME: Bug #759424; chain.c32 is needed to boot from the local hard disk.
[...]
> Why are the files other than chain.c32 no longer copied?
Again, a more detailed explanation is now in the changelog.
I hope this is in a better shape now, a new debdiff is attached.
Best regards,
Andi
diff -Nru debian-lan-config-0.19/debian/changelog debian-lan-config-0.19+deb8u1/debian/changelog
--- debian-lan-config-0.19/debian/changelog 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/debian/changelog 2015-05-28 15:56:03.000000000 +0200
@@ -1,3 +1,23 @@
+debian-lan-config (0.19+deb8u1) stable-proposed-updates; urgency=medium
+
+ * Fix package names on i386.
+ * Workarounds: #759424 (di-n-a) removed, #774033 (deadlock) added.
+ - With the NMUed di-netboot-assistant package available in jessie,
+ only chain.c32 has to be copied to the tftp-boot directory. It is
+ needed to boot from the local disk in the Debian-LAN PXE menu.
+ - The Debian-LAN live system freezes when mounting the home
+ directory with NFSv4. Switch back to NFSv3 which works fine.
+ * Fix squid configuration: Modify ordering to succeed in a single
+ cfengine pass.
+ * Comment 'browser-plugin-gnash' and 'adzapper' in the package-list and
+ the corresponding script: These packages did not make it into jessie.
+ * Define the replacement of exim4-daemon-light by exim4-daemon-heavy and
+ sudo by sudo-ldap to make conversion more robust.
+ * Describe how to use an arbitrary hostname for the 'mainserver'.
+ * Add libcgi-fast-perl to make the zoom in munin work.
+
+ -- Andreas B. Mundt <andi@debian.org> Sun, 17 May 2015 20:22:54 +0200
+
debian-lan-config (0.19) unstable; urgency=medium
* Adapt to the format of '/etc/debian_version' (closes: #774035).
diff -Nru debian-lan-config-0.19/debian/README.Debian debian-lan-config-0.19+deb8u1/debian/README.Debian
--- debian-lan-config-0.19/debian/README.Debian 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/debian/README.Debian 2015-05-28 15:56:03.000000000 +0200
@@ -62,6 +62,21 @@
Adapt the config space to your needs if necessary and run FAI with the
variable CONVERT set to true:
+ export SUDO_FORCE_REMOVE=yes # to switch from sudo to sudo-ldap
export CONVERT=true ; fai -vN -s file:///srv/fai/config/ softupdate
- -- Andreas B. Mundt <andi@debian.org> Wed, 30 Jan 2013 18:50:03 +0100
+
+Further Notes
+-------------
+
+If you prefer not to use the hostname 'mainserver' but $HOSTNAME, use
+the following commands to replace it in the fai config space:
+
+ cd /srv/fai/config/
+ for FILE in $(grep -rl mainserver *) ; \
+ do sed -i "s/mainserver/$HOSTNAME/g" $FILE ; done
+
+ mv files/etc/hosts/mainserver files/etc/hosts/$HOSTNAME
+ cd -
+
+ -- Andreas B. Mundt <andi@debian.org> Tue, 31 Mar 2015 22:50:03 +0200
diff -Nru debian-lan-config-0.19/fai/config/files/etc/fai/NFSROOT/FAISERVER debian-lan-config-0.19+deb8u1/fai/config/files/etc/fai/NFSROOT/FAISERVER
--- debian-lan-config-0.19/fai/config/files/etc/fai/NFSROOT/FAISERVER 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/files/etc/fai/NFSROOT/FAISERVER 2015-05-28 15:56:03.000000000 +0200
@@ -33,7 +33,7 @@
PACKAGES aptitude I386
grub-pc
-linux-image-686
+linux-image-686-pae
PACKAGES aptitude AMD64
grub-pc
diff -Nru debian-lan-config-0.19/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER debian-lan-config-0.19+deb8u1/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
--- debian-lan-config-0.19/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER 2015-05-28 15:56:03.000000000 +0200
@@ -101,7 +101,8 @@
label Debian-LAN/FAI Live System
kernel $KERNEL
-append initrd=$INITRD ip=dhcp root=nfs4:/$(basename $DLROOT) aufs
+## FIXME #774033 ## append initrd=$INITRD ip=dhcp root=nfs4:/$(basename $DLROOT) aufs
+append initrd=initrd.img ip=dhcp root=/dev/nfs nfsroot=/srv/nfs4/live aufs
EOF
## Create pxelinux boot configuration for disklessXX.
diff -Nru debian-lan-config-0.19/fai/config/package_config/DEBIAN debian-lan-config-0.19+deb8u1/fai/config/package_config/DEBIAN
--- debian-lan-config-0.19/fai/config/package_config/DEBIAN 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/DEBIAN 2015-05-28 15:56:03.000000000 +0200
@@ -1,8 +1,8 @@
PACKAGES aptitude-r I386
-linux-image-686
+linux-image-686-pae
PACKAGES aptitude CHROOT
-linux-image-686-
+linux-image-686-pae-
linux-image-amd64-
PACKAGES aptitude-r AMD64
diff -Nru debian-lan-config-0.19/fai/config/package_config/DESKTOP debian-lan-config-0.19+deb8u1/fai/config/package_config/DESKTOP
--- debian-lan-config-0.19/fai/config/package_config/DESKTOP 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/DESKTOP 2015-05-28 15:56:03.000000000 +0200
@@ -21,7 +21,7 @@
## other packages:
iceweasel
-browser-plugin-gnash
+#browser-plugin-gnash
icedove
enigmail
diff -Nru debian-lan-config-0.19/fai/config/package_config/DISKLESS_CLIENT debian-lan-config-0.19+deb8u1/fai/config/package_config/DISKLESS_CLIENT
--- debian-lan-config-0.19/fai/config/package_config/DISKLESS_CLIENT 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/DISKLESS_CLIENT 2015-05-28 15:56:03.000000000 +0200
@@ -23,7 +23,7 @@
## other packages:
iceweasel
-browser-plugin-gnash
+#browser-plugin-gnash
icedove
enigmail
diff -Nru debian-lan-config-0.19/fai/config/package_config/LOG_SERVER debian-lan-config-0.19+deb8u1/fai/config/package_config/LOG_SERVER
--- debian-lan-config-0.19/fai/config/package_config/LOG_SERVER 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/LOG_SERVER 2015-05-28 15:56:03.000000000 +0200
@@ -3,8 +3,11 @@
PACKAGES aptitude
apache2
libapache2-mod-auth-kerb
+
munin
munin-node
+libcgi-fast-perl
+
icinga
nagios-images
monitoring-plugins-standard
diff -Nru debian-lan-config-0.19/fai/config/package_config/MAIL_SERVER debian-lan-config-0.19+deb8u1/fai/config/package_config/MAIL_SERVER
--- debian-lan-config-0.19/fai/config/package_config/MAIL_SERVER 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/MAIL_SERVER 2015-05-28 15:56:03.000000000 +0200
@@ -1,4 +1,5 @@
PACKAGES aptitude
+exim4-daemon-light-
exim4-daemon-heavy
dovecot-imapd
dovecot-gssapi
diff -Nru debian-lan-config-0.19/fai/config/package_config/PROXY debian-lan-config-0.19+deb8u1/fai/config/package_config/PROXY
--- debian-lan-config-0.19/fai/config/package_config/PROXY 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/PROXY 2015-05-28 15:56:03.000000000 +0200
@@ -2,6 +2,9 @@
## Put all setup-dependent packages in the SETUP_* class.
PACKAGES aptitude
squid3
-adzapper
+
+## FIXME #722717
+#adzapper
+
## Uncomment for web filtering:
#dansguardian
diff -Nru debian-lan-config-0.19/fai/config/package_config/SERVER_A debian-lan-config-0.19+deb8u1/fai/config/package_config/SERVER_A
--- debian-lan-config-0.19/fai/config/package_config/SERVER_A 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/package_config/SERVER_A 2015-05-28 15:56:03.000000000 +0200
@@ -2,6 +2,7 @@
## another class.
PACKAGES aptitude
ssl-cert
+sudo-
sudo-ldap
screen
exim4 nullmailer-
diff -Nru debian-lan-config-0.19/fai/config/scripts/FAISERVER/50-di-netboot debian-lan-config-0.19+deb8u1/fai/config/scripts/FAISERVER/50-di-netboot
--- debian-lan-config-0.19/fai/config/scripts/FAISERVER/50-di-netboot 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/scripts/FAISERVER/50-di-netboot 2015-05-28 15:56:03.000000000 +0200
@@ -5,9 +5,6 @@
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
@@ -21,7 +18,8 @@
LABEL Debian-LAN Live System
MENU LABEL Debian-LAN Live System
KERNEL ::/fai/vmlinuz
- APPEND initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
+ ## FIXME #774033 ## APPEND initrd=::/fai/initrd.img ip=dhcp root=nfs4:/live aufs
+ APPEND initrd=::/fai/initrd.img ip=dhcp root=/dev/nfs nfsroot=/srv/nfs4/live aufs
EOF
fi
@@ -41,7 +39,6 @@
EOF
sed -i "s%^\(TFTP_ROOT=.*\)$%\#\1\nTFTP_ROOT=/srv/tftp%" ${target}/etc/di-netboot-assistant/di-netboot-assistant.conf
- sed -i "s%^#\($DISTRI\)%\1%" ${target}/etc/di-netboot-assistant/di-sources.list
mkdir -p ${target}/var/www/html/d-i/$DISTRI
cat > "${target}/var/www/html/d-i/$DISTRI/preseed.cfg" <<EOF
@@ -107,12 +104,8 @@
$ROOTCMD di-netboot-assistant install $DISTRI --arch=i386
$ROOTCMD di-netboot-assistant rebuild-menu
-# 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
-done
+# chain.c32 is needed to boot from the local hard disk:
+$ROOTCMD cp /usr/lib/syslinux/modules/bios/chain.c32 /srv/tftp/debian-installer/
#wheezy:
#d-i preseed/late_command string mkdir -p /target/var/lib/fai/config; \
diff -Nru debian-lan-config-0.19/fai/config/scripts/PROXY/10-config debian-lan-config-0.19+deb8u1/fai/config/scripts/PROXY/10-config
--- debian-lan-config-0.19/fai/config/scripts/PROXY/10-config 2014-12-31 10:44:11.000000000 +0100
+++ debian-lan-config-0.19+deb8u1/fai/config/scripts/PROXY/10-config 2015-05-28 15:56:03.000000000 +0200
@@ -7,55 +7,58 @@
editfiles:
any::
- { ${target}/etc/adzapper.conf
- ## Configure adzapper:
- ReplaceAll 'ZAP_MODE=""' With 'ZAP_MODE="CLEAR"'
- }
-
- { ${target}/etc/squid3/squid.conf
- ## Define local network:
- ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
-
- ## Allow CUPS access:
- BeginGroupIfNoSuchLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
- LocateLineMatching 'acl SSL_ports port 443.*'
- InsertLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
- LocateLineMatching 'acl Safe_ports port 443.*'
- InsertLine 'acl Safe_ports port 631$(tab)$(tab)# cups'
- EndGroup
-
- ## Allow local network:
- BeginGroupIfNoSuchLine "http_access allow localnet"
- LocateLineMatching "http_access allow localhost"
- InsertLine "http_access allow localnet"
- EndGroup
-
- ## Package cache:
- BeginGroupIfNoSuchLine 'maximum_object_size_in_memory 10240 KB'
- LocateLineMatching '# maximum_object_size_in_memory .*'
- InsertLine 'maximum_object_size_in_memory 10240 KB'
- EndGroup
-
- ## Use disk cache:
- BeginGroupIfNoSuchLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
- LocateLineMatching '#cache_dir .*'
- InsertLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
- EndGroup
-
- ## Package cache:
- BeginGroupIfNoSuchLine 'maximum_object_size 512 MB'
- LocateLineMatching '# maximum_object_size .*'
- InsertLine 'maximum_object_size 512 MB'
- EndGroup
-
- ## Define url_rewrite_program:
- BeginGroupIfNoSuchLine "url_rewrite_program /usr/bin/adzapper.wrapper"
- LocateLineMatching "# TAG: url_rewrite_program"
- InsertLine "url_rewrite_program /usr/bin/adzapper.wrapper"
- EndGroup
- ## Package cache:
- BeginGroupIfNoSuchLine 'refresh_pattern deb$(dollar) 129600 100% 129600'
+## FIXME #722717
+# { ${target}/etc/adzapper.conf
+# ## Configure adzapper:
+# ReplaceAll 'ZAP_MODE=""' With 'ZAP_MODE="CLEAR"'
+# }
+
+ { ${target}/etc/squid3/squid.conf
+ ## Define local network:
+ ReplaceAll "#acl localnet src 10.0.0.0/8" With "acl localnet src ${SUBNETMASK}"
+
+ ## Allow CUPS access:
+ BeginGroupIfNoSuchLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
+ LocateLineMatching 'acl SSL_ports port 443.*'
+ InsertLine 'acl SSL_ports port 631$(tab)$(tab)# cups'
+ LocateLineMatching 'acl Safe_ports port 443.*'
+ InsertLine 'acl Safe_ports port 631$(tab)$(tab)# cups'
+ EndGroup
+
+ ## Allow local network:
+ BeginGroupIfNoSuchLine "http_access allow localnet"
+ LocateLineMatching "http_access allow localhost"
+ InsertLine "http_access allow localnet"
+ EndGroup
+
+ ## Package cache:
+ BeginGroupIfNoSuchLine 'maximum_object_size_in_memory 10240 KB'
+ LocateLineMatching '# maximum_object_size_in_memory .*'
+ InsertLine 'maximum_object_size_in_memory 10240 KB'
+ EndGroup
+
+ ## Package cache:
+ BeginGroupIfNoSuchLine 'maximum_object_size 512 MB'
+ LocateLineMatching '# maximum_object_size .*'
+ InsertLine 'maximum_object_size 512 MB'
+ EndGroup
+
+ ## Use disk cache:
+ BeginGroupIfNoSuchLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
+ LocateLineMatching '#cache_dir .*'
+ InsertLine 'cache_dir aufs /var/spool/squid3 10000 16 256'
+ EndGroup
+
+## FIXME #722717
+# ## Define url_rewrite_program:
+# BeginGroupIfNoSuchLine "url_rewrite_program /usr/bin/adzapper.wrapper"
+# LocateLineMatching "# TAG: url_rewrite_program"
+# InsertLine "url_rewrite_program /usr/bin/adzapper.wrapper"
+# EndGroup
+
+ ## Package cache:
+ BeginGroupIfNoSuchLine 'refresh_pattern deb$(dollar) 129600 100% 129600'
LocateLineMatching "# TAG: refresh_pattern"
InsertLine 'refresh_pattern deb$(dollar) 129600 100% 129600'
InsertLine 'refresh_pattern udeb$(dollar) 129600 100% 129600'
@@ -65,5 +68,5 @@
InsertLine 'refresh_pattern \/(Packages|Sources)(|\.bz2|\.gz|\.xz)$(dollar) 0 0% 0 refresh-ims'
InsertLine 'refresh_pattern \/Release(|\.gpg)$(dollar) 0 0% 0 refresh-ims'
InsertLine 'refresh_pattern \/InRelease$(dollar) 0 0% 0 refresh-ims'
- EndGroup
- }
+ EndGroup
+ }
Reply to: