Commit 0168eb88 authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

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.
parent ffa8dd18

debian/changelog

+3 −0
Original line number Diff line number Diff line
@@ -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@arcor.de>  Thu, 15 Nov 2018 02:55:59 +0100

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

+1 −8
Original line number Diff line number Diff line
@@ -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() {