diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-10-09 00:35:45 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:06 +0100 |
| commit | f3da632272998a39ccd0388d87eec04a5ad6cbc1 (patch) | |
| tree | 87df0491cad827889ca48cb62ed95a49990462ea | |
| parent | a95723c3df57eee5676190321e80057960ab039a (diff) | |
| download | live-boot-f3da632272998a39ccd0388d87eec04a5ad6cbc1.tar.gz live-boot-f3da632272998a39ccd0388d87eec04a5ad6cbc1.zip | |
Merging casper 1.110.
| -rw-r--r-- | docs/ChangeLog.casper | 8 | ||||
| -rwxr-xr-x | scripts/live-bottom/38disable_restricted_manager | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 4832706..f4954ba 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,11 @@ +casper (1.110) gutsy; urgency=low + + * Don't generate fglrx or the nvidia modules in the live session at boot; + we disable restricted-manager in the live session anyway so they aren't + straightforward to use (see #43706). Saves about 19 MB of memory. + + -- Colin Watson <cjwatson@ubuntu.com> Fri, 05 Oct 2007 21:28:29 +0100 + casper (1.109) gutsy; urgency=low * Cache the stty binary before ejecting the CD. diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager index 2a6f1ca..6bc9cb8 100755 --- a/scripts/live-bottom/38disable_restricted_manager +++ b/scripts/live-bottom/38disable_restricted_manager @@ -27,4 +27,10 @@ log_begin_msg "Disabling restricted-manager..." rm -f /root/etc/xdg/autostart/restricted-manager.desktop rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop +# Since we disable restricted-manager, there isn't much point generating the +# fglrx or nvidia modules either. The other restricted modules may still be +# useful. +sed -i 's/^DISABLED_MODULES=""/DISABLED_MODULES="fglrx nv"/' \ + /root/etc/default/linux-restricted-modules-common + log_end_msg |