[debian-edu-commits] debian-edu/ 01/01: Adjust sbin/debian-edu-pxeinstall to use NBD for LTSP clients; this is now the LTSP default, usage of NFS is broken atm (see #786925).

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit e6c452e3bfe5950433431699fbc3156433c3a641
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Apr 24 18:31:23 2016 +0200

    Adjust sbin/debian-edu-pxeinstall to use NBD for LTSP clients; this is now the LTSP default, usage of NFS is broken atm (see #786925).
---
 debian/changelog           | 2 ++
 sbin/debian-edu-pxeinstall | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffe313c..6013bc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ debian-edu-config (1.901) UNRELEASED; urgency=medium
     - replace iceweasel with firefox in various files.
     - use '/etc/firefox-esr' as place for firefox preference files.
     - update Makefile.
+  * Adjust sbin/debian-edu-pxeinstall to use NBD for LTSP clients; this
+    is now the LTSP default, usage of NFS is broken atm (see #786925).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
 
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 02b440a..d7b9efb 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -307,11 +307,11 @@ if [ -d /var/lib/tftpboot/ltsp/i386 ] ; then
 LABEL ltsp-thin
         MENU    LABEL  LTSP ^thin client
         KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro LTSP_FATCLIENT=False quiet
+        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp root=/dev/nbd0 ro LTSP_FATCLIENT=False quiet
 	IPAPPEND 2
 EOF
     cat > $tftpdir/debian-edu/default-thin.cfg <<EOF
-DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro LTSP_FATCLIENT=False quiet ipappend 2
+DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp root=/dev/nbd0 ro LTSP_FATCLIENT=False quiet ipappend 2
 
 EOF
 
@@ -324,12 +324,12 @@ EOF
 LABEL ltsp-diskless
         MENU    LABEL  LTSP ^diskless workstation
         KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro quiet
+        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp root=/dev/nbd0 ro quiet
 	IPAPPEND 2
 
 EOF
 	cat > $tftpdir/debian-edu/default-diskless.cfg <<EOF
-DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro quiet ipappend 2
+DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp root=/dev/nbd0 ro quiet ipappend 2
 EOF
     fi
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git