[debian-edu-commits] r81238 - in branches/wheezy/debian-edu-config: debian share/ltsp/plugins/ltsp-build-client/Debian-custom

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-28 12:18:40 +0000 (Fri, 28 Jun 2013)
New Revision: 81238

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
Log:
Move code in 032-edu-pkgs removing the force-unsafe-io dpkg flag
to after the workstation is configured, to ensure it have effect for
most of the LTSP installation period.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 10:37:25 UTC (rev 81237)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-28 12:18:40 UTC (rev 81238)
@@ -11,6 +11,9 @@
   * Adjust auto-addfirmware and make sure to add contrib and non-free
     when trying to install the firmware-b43-installer package on
     machines needing it.
+  * Move code in 032-edu-pkgs removing the force-unsafe-io dpkg flag
+    to after the workstation is configured, to ensure it have effect for
+    most of the LTSP installation period.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 28 Jun 2013 12:07:11 +0200
 

Modified: branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs	2013-06-28 10:37:25 UTC (rev 81237)
+++ branches/wheezy/debian-edu-config/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs	2013-06-28 12:18:40 UTC (rev 81238)
@@ -423,7 +423,6 @@
 EOF
         ;;
     finalization)
-        rm $ROOT/etc/dpkg/dpkg.cfg.d/force-unsafe-io
         # Run this in finalizatoin and not in after-install to make
         # sure boot system modifications are done after the ones done
         # in LTSP by default.
@@ -433,5 +432,9 @@
                 rm -f $ROOT/etc/apt/apt.conf.d/90ltsp-build-client
             fi
         fi
+
+        # Remove dpkg optimalizatoin after setup_diskless_workstation,
+        # to ensure it have effect while most packages are installed.
+        rm $ROOT/etc/dpkg/dpkg.cfg.d/force-unsafe-io
         ;;
 esac