Merge branches

diff --git a/.hgtags b/.hgtags
index b3f9006..27e47f0 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -12,3 +12,4 @@ e692ab743cede8f4da907875f8378412c62a8ac5 0.0.11
 f907e68e533a38dc883a13a3079609cb9f48ff93 0.0.12
 c7669b579e281be31b3287763762f4a33702547b 0.0.13
 8122bf5ffd5711a11a2844a57a5c19115320e9ac 0.0.14
+febe40c53d18bac67ea8f434f33305944260ebe5 0.1

diff --git a/debian/changelog b/debian/changelog
index ec3192e..04f235f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+grml-live (0.2) unstable; urgency=low
+
+  * Update isolinux.bin to version 3.55-1.
+  * Add loop-aes-testsuite to GRML_FULL.
+  * Set 'confirm=1' in /etc/apt/listchanges.conf.
+  * Add /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
+    for providing default /etc/default/loadcpufreq configuration.
+  * Move sourcing /etc/grml/grml-live.local *before* the cmdline
+    option parsing so we can override already set defaults interative.
+  * Grep using the quiet option for squashfs features.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 14 Jan 2008 22:54:10 +0100
+
 grml-live (0.1) unstable; urgency=low
 
   * Bump version number to 0.1 as we ship grml-live with the
@@ -7,13 +20,16 @@ grml-live (0.1) unstable; urgency=low
   * Use /usr/bin/vim.tiny as alternativ for vi.
   * Add new packages to GRML_FULL:
     - at76-usb-modules-2.6.23-grml64
+    - bluez-audio
     - conky (thanks, shehu)
     - epdfview
     - gfs2-tools
     - sslscan
     - truecrypt-2.6.23-grml64
     - unsort
+  * Remove bluetooth-alsa from GRML_FULL.
   * Add new packages to GRML_MEDIUM:
+    - ntfs-3g
     - truecrypt-2.6.23-grml64
   * templates/boot/grub/menu.lst, templates/boot/isolinux/*.cfg:
     - drop deprecated entries

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 0728489..153fc64 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -311,7 +311,7 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluetooth-alsa
+bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -1030,6 +1030,7 @@ logtools
 logwatch
 lomoco
 loop-aes-utils
+loop-aes-testsuite
 lrzsz
 lsb-base
 lsb-release

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index a95ee5d..f4e4a0e 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -151,6 +151,7 @@ netbase
 netcat
 net-tools
 nfs-common
+ntfs-3g
 ntfsprogs
 ntpdate
 nvi

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
new file mode 100755 (executable)
index 0000000..6e68b6e
--- /dev/null
+++ b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
+# Purpose:       configure cpufrequtils of live-system
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+# Latest change: Sun Jan 20 19:35:25 CET 2008 [mika]
+################################################################################
+
+set -u
+set -e
+
+[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+
+if [ -r $target/usr/share/doc/cpufrequtils/examples/cpufrequtils.sample ] ; then
+   if ! [ -r $target/etc/default/loadcpufreq ] ; then
+      cat $target/usr/share/doc/cpufrequtils/examples/cpufrequtils.sample > $target/etc/default/loadcpufreq
+      sed -i 's/^ENABLE=.*/ENABLE="true"/' $target/etc/default/loadcpufreq
+   fi
+fi
+
+## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
index efe71fa..1a2f187 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
+++ b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Fri Dec 21 21:40:16 CET 2007 [mika]
+# Latest change: Sun Jan 20 00:25:52 CET 2008 [mika]
 ################################################################################
 
 set -e
@@ -24,6 +24,7 @@ fi
 
 if [ -r $target/etc/apt/listchanges.conf ] ; then
    sed -i "s/^which=news/which=both/" $target/etc/apt/listchanges.conf
+   sed -i "s/^confirm=0/confirm=1/"   $target/etc/apt/listchanges.conf
 fi
 
 ## END OF FILE #################################################################

diff --git a/grml-live b/grml-live
index 664c145..e35dcbf 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Fre Jän 11 10:22:19 CET 2008 [mika]
+# Latest change: Die Jän 22 11:57:54 CET 2008 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -15,7 +15,7 @@ export LC_ALL=C
 # exit on any error:
 set -e
 
-GRML_LIVE_VERSION='0.1'
+GRML_LIVE_VERSION='0.2'
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"
 
@@ -189,7 +189,6 @@ fi
 # }}}
 
 # command line parsing {{{
-
 while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; do
   case "$opt" in
     a) ARCH="$OPTARG" ;;
@@ -548,7 +547,7 @@ else
    [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
 
    # execute squashfs:
-   if mksquashfs --help 2>&1 | grep -- -no-progress ; then
+   if mksquashfs --help 2>&1 | grep -q -- -no-progress ; then
       log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress"
       mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB
    else

diff --git a/templates/boot/isolinux/isolinux.bin b/templates/boot/isolinux/isolinux.bin
index c4480ae..36aa3e9 100644 (file)
Binary files a/templates/boot/isolinux/isolinux.bin and b/templates/boot/isolinux/isolinux.bin differ