[debian-edu-commits] debian-edu/ 02/02: Revert "032-edu-pkgs: move 'debian-edu-install' installation to 'after-install)'."

[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 1c72c5e0d6574f58d0779cccfe2fb5a13e48a9a5
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Oct 14 21:12:56 2017 +0200

    Revert "032-edu-pkgs: move 'debian-edu-install' installation to 'after-install)'."
    
    This reverts commit 38c587da521b3928d4a9b4cc193e6fa5b93f7f73.
    
    Thanks to Petter for the review.
---
 share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 db48df2..50bd3f8 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
@@ -140,6 +140,10 @@ install_diskless_workstation() {
     sed 's/^PROFILE=\".*/PROFILE=\"Workstation\"/' \
         < /etc/debian-edu/config > $ROOT/etc/debian-edu/config
 
+    # Install the installation package to load preseeding values based
+    # on the /etc/debian-edu/config PROFILE
+    in_target apt-get install -y -q debian-edu-install
+
     # Add preseeding values, without the popularity-contest settings
     # to avoid several hosts reporting with the same popcon ID.
     (
@@ -432,10 +436,6 @@ EOF
         fi
         ;;
     after-install)
-        # Install the installation package to load preseeding values based
-        # on the /etc/debian-edu/config PROFILE
-        in_target apt-get install -y -q debian-edu-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

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