From: Michael Prokop <mika@grml.org>
Date: Tue, 22 Jan 2008 10:58:17 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.2~4^2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=079ea71204d408f78886da20fe019dd631a3b2bc;hp=-c

Merge branches
---

079ea71204d408f78886da20fe019dd631a3b2bc
diff --combined debian/changelog
index ec3192e,4b6b44b..04f235f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,33 +1,35 @@@
+ 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
      upcoming stable versions.
 +  * Source /etc/grml/grml-live.local before parsing command line
 +    options to be able to override configuration on the commandline.
    * 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 --combined grml-live
index 664c145,534b809..e35dcbf
--- a/grml-live
+++ b/grml-live
@@@ -4,10 -4,10 +4,10 @@@
  # 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: Sun Jan 20 22:38:18 CET 2008 [mika]
++# Latest change: Die Jän 22 11:57:54 CET 2008 [mika]
  ################################################################################
  
 -# main initialization  setup, set some misc variables {{{
 +# read configuration files, set some misc variables {{{
  
  export LANG=C
  export LC_ALL=C
@@@ -15,7 -15,7 +15,7 @@@
  # exit on any error:
  set -e
  
- GRML_LIVE_VERSION='0.1'
+ GRML_LIVE_VERSION='0.2'
  CMDLINE="$0 $@"
  ISO_DATE="$(date +%Y-%m-%d)"
  
@@@ -186,10 -186,27 +186,9 @@@ els
     log "No $LOCAL_CONFIG found, not sourcing it"
     LOCAL_CONFIG=''
  fi
 -
 -# clean/zero grml-live logfile:
 -if [ -n "$ZERO_LOGFILE" ] ; then
 -   echo -n > $LOGFILE
 -fi
 -
 -# clean/zero/remove old FAI directory:
 -if [ -n "$ZERO_FAI_LOGFILE" ] ; then
 -   if [ -d /var/log/fai/"$HOSTNAME" ] ; then
 -      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)"
 -      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)"
 -      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)"
 -      rm -f /var/log/fai/"$HOSTNAME"/last \
 -            /var/log/fai/"$HOSTNAME"/last-dirinstall \
 -            /var/log/fai/"$HOSTNAME"/last-softupdate
 -   fi
 -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" ;;
@@@ -225,25 -242,6 +224,25 @@@ specify it on the command line using th
  specify it on the command line using the -o option."
  # }}}
  
 +# clean/zero grml-live logfile {{{
 +if [ -n "$ZERO_LOGFILE" ] ; then
 +   echo -n > $LOGFILE
 +fi
 +# }}}
 +
 +# clean/zero/remove old FAI directory {{{
 +if [ -n "$ZERO_FAI_LOGFILE" ] ; then
 +   if [ -d /var/log/fai/"$HOSTNAME" ] ; then
 +      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)"
 +      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)"
 +      rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)"
 +      rm -f /var/log/fai/"$HOSTNAME"/last \
 +            /var/log/fai/"$HOSTNAME"/last-dirinstall \
 +            /var/log/fai/"$HOSTNAME"/last-softupdate
 +   fi
 +fi
 +# }}}
 +
  # ask user whether the setup is ok {{{
  if [ -z "$FORCE" ] ; then
     echo
@@@ -548,7 -546,7 +547,7 @@@ els
     [ -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