[debian-edu-commits] r79495 - in branches/wheezy/debian-edu-config: debian sbin testsuite

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-03-27 23:33:17 +0000 (Wed, 27 Mar 2013)
New Revision: 79495

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
   branches/wheezy/debian-edu-config/testsuite/ltsp
Log:
* testsuite/ltsp: Replace /etc/ltsp_chroot with /etc/lts.conf to
  test if the ltsp chroot exists, as ltsp_chroot seems to have 
  been dropped.
* debian-edu-pxeinstall:
  - Change kernel command lines to reflect new ltsp init process.
  - Append ipappend 2 (syslinux) to define network boot interface.
  - Change target distribution from squeeze to wheezy.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-03-27 23:14:20 UTC (rev 79494)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-03-27 23:33:17 UTC (rev 79495)
@@ -1,3 +1,15 @@
+debian-edu-config (1.704~svn79463) UNRELEASED; urgency=low
+
+  * testsuite/ltsp: Replace /etc/ltsp_chroot with /etc/lts.conf to
+    test if the ltsp chroot exists, as ltsp_chroot seems to have 
+    been dropped.
+  * debian-edu-pxeinstall:
+    - Change kernel command lines to reflect new ltsp init process.
+    - Append ipappend 2 (syslinux) to define network boot interface.
+    - Change target distribution from squeeze to wheezy.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 28 Mar 2013 00:15:27 +0100
+
 debian-edu-config (1.704~svn79463) wheezy-test; urgency=low
  
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-03-27 23:14:20 UTC (rev 79494)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-03-27 23:33:17 UTC (rev 79495)
@@ -70,7 +70,7 @@
 # Workaround for bad lsb_release behaviour when only a CD/DVD APT
 # source is listed in /etc/sources.list.
 if [ "n/a" = "$dist" ] ; then
-    dist=squeeze
+    dist=wheezy
 fi
 
 if [ -f /etc/debian-edu/config ] ; then
@@ -260,6 +260,7 @@
         MENU LABEL Install Edu/^$arch ($desktop)
         kernel debian-installer/$arch/linux
         append $gtkvideo initrd=debian-installer/$arch/initrd.gz -- quiet url=$preseedurl hostname=$hostname domain=$domain $installconfig
+	ipappend 2
 include menupassword.cfg
 
 EOF
@@ -291,28 +292,29 @@
 LABEL ltsp-thin
         MENU    LABEL  LTSP ^thin client
         KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=$ltsproot boot=nfs ro quiet 4
-
+        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs 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 nfsroot=$ltsproot boot=nfs ro quiet 4
+DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro LTSP_FATCLIENT=False quiet ipappend 2
+
 EOF
 
 # See if LTSP also have diskless workstation support
-    if [ -e $ltsproot/lib/security/pam_ldap.so ] || \
-       [ -e $ltsproot/lib/security/pam_krb5.so ] || \
-       [ -e $ltsproot/lib/security/pam_sss.so ] ; then
+    if [ -e $ltsproot/lib/i386-linux-gnu/security/pam_krb5.so ] || \
+       [ -e $ltsproot/lib/i386-linux-gnu/security/pam_ldap.so ] || \
+       [ -e $ltsproot/lib/i386-linux-gnu/security/pam_sss.so ] ; then
 	cat <<EOF > $tftpdir/debian-edu/ltsp-diskless.cfg
 
 LABEL ltsp-diskless
         MENU    LABEL  LTSP ^diskless workstation
         KERNEL ltsp/i386/vmlinuz
-        APPEND initrd=ltsp/i386/initrd.img nfsroot=$ltsproot boot=nfs ro quiet 3
+        APPEND initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro quiet
+	IPAPPEND 2
 
-
 EOF
 	cat > $tftpdir/debian-edu/default-diskless.cfg <<EOF
-DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=$ltsproot boot=nfs ro quiet 3
+DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img init=/sbin/init-ltsp nfsroot=$ltsproot boot=nfs ro quiet epappend 2
 EOF
     fi
 fi

Modified: branches/wheezy/debian-edu-config/testsuite/ltsp
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/ltsp	2013-03-27 23:14:20 UTC (rev 79494)
+++ branches/wheezy/debian-edu-config/testsuite/ltsp	2013-03-27 23:33:17 UTC (rev 79495)
@@ -19,7 +19,7 @@
 
 if echo "$PROFILE" | grep -q Thin-Client-Server ; then
     chroot="/opt/ltsp/$LTSPARCH"
-    if [ -f $chroot/etc/ltsp_chroot ] ; then
+    if [ -f $chroot/etc/lts.conf ] ; then
 	success "Found LTSP chroot"
     else
 	error "LTSP chroot is missing in $chroot/"