[debian-edu-commits] debian-edu/ 03/03: Split the setup of the diskless workstation envionment in LTSP into three parts to get some more progress bar movement during installation.

[Petter Reinholdtsen]

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

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

commit 57a5c24fff5ac7bf1cb4083ee879d74e39500818
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Mar 28 15:12:27 2016 +0000

    Split the setup of the diskless workstation envionment in LTSP into three parts to get some more progress bar movement during installation.
---
 debian/changelog                                   |  3 +++
 .../ltsp-build-client/Debian-custom/032-edu-pkgs   | 28 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7918ab0..27e3b4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ debian-edu-config (1.819) UNRELEASED; urgency=low
     that we no longer use pdns.
   * Replace 'jessie' with 'stretch' everywhere to prepare for the
     next release.
+  * Split the setup of the diskless workstation envionment in LTSP
+    into three parts to get some more progress bar movement during
+    installation.
 
   [ Mike Gabriel ]
   * Add quotes around DNs when evoking kadmin.local in gosa-create and
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 6b7c31f..0057d55 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
@@ -130,7 +130,9 @@ etcvcs_commit() {
     fi
 }
 
-setup_diskless_workstation() {
+# Setting up a diskless workstation, using three parts/functions to
+# get more steps on the progress bar shown by d-i.
+install_diskless_workstation() {
     etcvcs_commit "Before diskless workstation is set up"
 
     # Add Edu config with language and profile.
@@ -193,7 +195,9 @@ setup_diskless_workstation() {
         # Preseed Sitesummary too
         in_target /usr/share/debian-edu-config/tools/preseed-sitesummary
     fi
+}
 
+after_install_diskless_workstation() {
     # Fetch current default locale to make tasksel pick the correct
     # language specific tasks.
     if [ -e /etc/default/locale ] ; then
@@ -218,7 +222,9 @@ setup_diskless_workstation() {
         diverts_remove
         return 1
     fi
+}
 
+finalization_diskless_workstation() {
     # Get rid of lvm2, as it causes the shutdown to hang.
     in_target apt-get -y purge lvm2
 
@@ -426,13 +432,25 @@ 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 this in finalization and not in after-install to make
-        # sure boot system modifications are done after the ones done
-        # in LTSP by default.
+        # 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
-            setup_diskless_workstation
+            finalization_diskless_workstation
             if [ "true" = "$LTSP_CDROM_INSTALL" ]; then
                 rm -f $ROOT/etc/apt/apt.conf.d/90ltsp-build-client
             fi

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