[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Revert "Make sure the iPXE setup is created for PXE installations in case of a plain main server"

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
c523d94e by Wolfgang Schweer at 2021-01-03T17:38:46+01:00
Revert "Make sure the iPXE setup is created for PXE installations in case of a plain main server"

This reverts commit 22db044ccf906f14983e2262f6e83d64d310ab9b.

The missing iPXE setup has actually been caused by a wrong PNG file reference in
sbin/debian-edu-pxeinstall (buster instead of homeworld for syslinux).

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
74925df2 by Wolfgang Schweer at 2021-01-03T17:57:38+01:00
Cleanup changelog from now obsolete entry

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


2 changed files:

- debian/changelog
- share/debian-edu-config/d-i/finish-install


Changes:

=====================================
debian/changelog
=====================================
@@ -6,9 +6,6 @@ debian-edu-config (2.11.43) UNRELEASED; urgency=medium
   * share/debian-edu-config/tools/edu-icinga-setup:
     - Cope with recent mariadb-server package changes. Some leftover occurencies
       of 'mysql' have been replaced with 'mariadb'.
-  * share/debian-edu-config/d-i/finish-install:
-    - Make sure the iPXE setup for PXE installations is created in case of a
-      plain main server. Despite the used tool no LTSP setup is actually done.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 03 Jan 2021 14:05:11 +0100
 


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -33,19 +33,6 @@ preserve_network_interfaces() {
 db_get debian-edu-install/profile
 PROFILE="$RET"
 
-# Make sure the iPXE setup is created for PXE installations in case of a plain
-# main server. Note that despite the used tool no LTSP setup is actually done.
-# The tool just comes in handy for this purpose.
-if echo "$PROFILE" | grep -qE 'Main-Server' && \
-	! echo "$PROFILE" | grep -q 'LTSP-Server' && \
-	[ -d /etc/ltsp ] ; then
-	if in-target /bin/sh -c "/usr/sbin/debian-edu-ltsp-install --diskless_workstation no" ; then
-		log "info: The iPXE setup succeeded"
-	else
-		log "error: The iPXE setup failed"
-	fi
-fi
-
 # Create LTSP thin client image and iPXE setup in case of a combined server.
 if echo "$PROFILE" | grep -Eq 'Main-Server.*LTSP-Server' ; then
 	in-target /bin/sh -c "modprobe squashfs"



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/541d201b45bf04ee2502282f1c408111e46595cc...74925df28f2f491116477d5717e488dc77b897dc

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/541d201b45bf04ee2502282f1c408111e46595cc...74925df28f2f491116477d5717e488dc77b897dc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210103/e0d63cdc/attachment-0001.html>