[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Install task 'standard' (system utilities) inside the LTSP chroot.

[WolfgangSchweer]

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


Commits:
0168eb88 by Wolfgang Schweer at 2018-11-16T14:29:17Z
Install task 'standard' (system utilities) inside the LTSP chroot.

It should ensure the installation is put on top of a stock Debian system
with nothing missing.

- - - - -


2 changed files:

- debian/changelog
- share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs


Changes:

=====================================
debian/changelog
=====================================
@@ -7,6 +7,9 @@ debian-edu-config (2.10.46) UNRELEASED; urgency=medium
     - Use code in share/ltsp/init-ltsp.d/60-edu-client to apply the patch (this
       happens only on-the-fly for each session in the overlay filesystem).
   * Adjust Makefile.
+  * Install task 'standard' (system utilities) inside the LTSP chroot. It should
+    ensure the installation is put on top of a stock Debian system with nothing
+    missing.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 15 Nov 2018 02:55:59 +0100
 


=====================================
share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
=====================================
@@ -21,7 +21,7 @@ in_target() {
 # Clean up changes done to the tasksel behaviour earlier and go back
 # to the default behavior.
 diverts_remove() {
-    for test in desktop new-install ; do
+    for test in desktop ; do
         if [ -f $ROOT/usr/lib/tasksel/tests/$test.edu ] ; then
             rm $ROOT/usr/lib/tasksel/tests/$test
             in_target dpkg-divert --package debian-edu-install --rename --quiet \
@@ -40,13 +40,6 @@ diverts_insert() {
         <$ROOT$file >$ROOT$file.edu
     in_target dpkg-divert --package debian-edu-install --rename --quiet --add $file
     ln -s ./desktop.edu $ROOT$file
-
-# And for the standard system task too
-    file=/usr/lib/tasksel/tests/new-install
-    sed -e 's/^case/# Do not install standard system task - added by debian-edu-install\nexit 3\n\n&/' \
-        <$ROOT$file >$ROOT$file.edu
-    in_target dpkg-divert --package debian-edu-install --rename --quiet --add $file
-    ln -s ./new-install.edu $ROOT$file
 }
 
 disable_cronjob() {



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/0168eb887b388fe100058e8d486ed58d94548cb1

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/0168eb887b388fe100058e8d486ed58d94548cb1
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/20181116/b841bcd1/attachment-0001.html>