[debian-edu-commits] debian-edu/ 01/02: 032-edu-pkgs: Move all diskless workstation installation parts to finalization.

[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 5c1b880d227297fd41ec48572806b9bd72d5be38
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Oct 15 23:23:30 2017 +0200

    032-edu-pkgs: Move all diskless workstation installation parts to finalization.
    
    The split into three parts (commit 57a5c24f) and moving these to three stages
    of LTSP chroot installation doesn't allow the consistent use of /media/cdrom/ and
    breaks the ability to install a complete combi server offline.
---
 .../plugins/ltsp-build-client/Debian-custom/032-edu-pkgs   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
index 50bd3f8..8bf823e 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
@@ -431,24 +431,14 @@ case "$MODE" in
         cat > $ROOT/etc/dpkg/dpkg.cfg.d/force-unsafe-io <<EOF
 force-unsafe-io
 EOF
-        if [ -n "$option_diskless_edu_workstation_value" ]; then
-            install_diskless_workstation
-        fi
-        ;;
-    after-install)
-        # This part myst run in after-install instead of configure to
-        # install packages after common/010-mount-proc is executed to
-        # make sure /proc is available when asking tasksel/apt to
-        # install Java packages.
-        if [ -n "$option_diskless_edu_workstation_value" ]; then
-            after_install_diskless_workstation
-        fi
         ;;
     finalization)
         # Run final setup in finalization step and not in
         # after-install to make sure boot system modifications are
         # done after the ones done in LTSP by default.
         if [ -n "$option_diskless_edu_workstation_value" ]; then
+            install_diskless_workstation
+            after_install_diskless_workstation
             finalization_diskless_workstation
             if [ "true" = "$LTSP_CDROM_INSTALL" ]; then
                 rm -f $ROOT/etc/apt/apt.conf.d/90ltsp-build-client

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