From: Michael Prokop Date: Sun, 1 Nov 2009 16:45:28 +0000 (+0100) Subject: Merge branch 'master' of ssh://git@git.grml.org/grml-live X-Git-Tag: v0.9.30~1 X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=27a3d5320ebfddf05770d111faa90d83f04f5a4c;hp=71846d11e35623f022974f1c8980471bff411e58;p=grml-live.git Merge branch 'master' of ssh://git@git.grml.org/grml-live --- diff --git a/debian/changelog b/debian/changelog index c1fcd09..56319c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,26 @@ grml-live (0.9.30) UNRELEASED; urgency=low + [ Michael Prokop ] * Support new option '-d ' to use specified date as build date information on the ISO instead of the default. * Fix posix violation in grml-live-remaster. + * Add jfsutils to GRML_MEDIUM and GRML_SMALL. + * Apply patch by Christian Hofstaedtler (thanks!): + Ensure /etc/mtab is always present. Newer debootstrap versions + no longer create /etc/mtab, so we need to provide our own. + * config/hooks/instsoft.GRMLBASE: + - force installation of file-rc using aptitude's + Aptitude::ProblemResolver::Keep-All-Tier option. + - drop insserv package. + * Replaced 'FAI_CONFIG_SRC=file:///etc/grml/fai' with + 'FAI_CONFIG_SRC=file:///etc/grml/fai/config' so it works with + fai >=3.2.23. + + [ Ulrich Dangel ] + * Remove denglish phrase from help file. Thanks to Andreas Gredler. + [Closes: issue758] - -- Michael Prokop Thu, 29 Oct 2009 13:14:52 +0100 + -- Michael Prokop Sun, 01 Nov 2009 13:08:40 +0100 grml-live (0.9.29) unstable; urgency=low diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index df99f5b..b192b8a 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -127,7 +127,14 @@ fi # make sure we have file-rc available before # package_config/GRML is being executed: $ROOTCMD apt-get update -$ROOTCMD aptitude -f -y install file-rc +# newer aptitude versions won't remove essential packages using +# 'aptitude -f -y install file-rc' anymore, therefore force it: +$ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc + +# get rid of insserv: +if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then + $ROOTCMD apt-get -y --purge remove insserv +fi # we definitely don't want to fail running fai dirinstall just # because of some well known bugs: diff --git a/etc/grml/fai/config/package_config/GRML_FORENSIC b/etc/grml/fai/config/package_config/GRML_FORENSIC index 55fb977..96cb0f8 100644 --- a/etc/grml/fai/config/package_config/GRML_FORENSIC +++ b/etc/grml/fai/config/package_config/GRML_FORENSIC @@ -442,7 +442,6 @@ irssi iscsitarget itop iwatch -jfsutils jhead john kexec-tools diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM index 73a3955..e37f594 100644 --- a/etc/grml/fai/config/package_config/GRML_MEDIUM +++ b/etc/grml/fai/config/package_config/GRML_MEDIUM @@ -104,6 +104,7 @@ ipw-firmware irqbalance jed jed-common +jfsutils keychain knockd latencytop diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL index 91d34eb..4a88abf 100644 --- a/etc/grml/fai/config/package_config/GRML_SMALL +++ b/etc/grml/fai/config/package_config/GRML_SMALL @@ -74,6 +74,7 @@ iputils-ping ipw-firmware jed jed-common +jfsutils keychain knockd less diff --git a/etc/grml/fai/config/scripts/GRMLBASE/02-mtab b/etc/grml/fai/config/scripts/GRMLBASE/02-mtab new file mode 100755 index 0000000..a7efced --- /dev/null +++ b/etc/grml/fai/config/scripts/GRMLBASE/02-mtab @@ -0,0 +1,27 @@ +#!/bin/sh +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/02-mtab +# Purpose: create mtab if it does not yet exist +# Authors: grml-team (grml.org), (c) Michael Prokop +# Bug-Reports: see http://grml.org/bugs/ +# License: This file is licensed under the GPL v2 or any later version. +################################################################################ + +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 + +# newer debootstrap does not create an mtab. +# create it and fill it with what is probably already mounted. +if [ ! -e $target/etc/mtab ] ; then + cat > $target/etc/mtab << EOF +proc /proc proc rw 0 0 +sysfs /sys sysfs rw 0 0 +/dev /dev tmpfs rw 0 0 +devpts /dev/pts devpts rw 0 0 +EOF +fi + +## END OF FILE ################################################################# +# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 diff --git a/etc/grml/fai/fai.conf b/etc/grml/fai/fai.conf index fb2a19e..6f0ab1e 100644 --- a/etc/grml/fai/fai.conf +++ b/etc/grml/fai/fai.conf @@ -26,7 +26,7 @@ FAI_CONFIGDIR=/etc/grml/fai/config # default if undefined here: nfs://`hostname`/$FAI_CONFIGDIR # supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,... #FAI_CONFIG_SRC=nfs://yourservername$FAI_CONFIGDIR -FAI_CONFIG_SRC=file:///etc/grml/fai +FAI_CONFIG_SRC=file:///etc/grml/fai/config # the following variables are read only for most users