# 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: Mit Okt 10 09:38:42 CEST 2007 [mika]
+# Latest change: Thu Oct 18 00:42:13 CEST 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
fi
if [ -r /var/run/fai/FAI_INSTALLATION_IN_PROGRESS ] ; then
- echo "/usr/sbin/fai already running or was aborted before."&>2
+ echo "/usr/sbin/fai already running or was aborted before.">&2
echo "You may remove /var/run/fai/FAI_INSTALLATION_IN_PROGRESS and try again.">&2
exit 1
fi
[ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
[ -n "$GRML_NAME" ] || GRML_NAME='grml'
-[ -n "$LOGDIR" ] || LOGDIR="/var/log/"
-LOGFILE="$LOGDIR/grml-live.log"
+if mkdir -p /var/log/fai/dirinstall/${HOSTNAME} ; then
+ LOGFILE=/var/log/fai/dirinstall/${HOSTNAME}/grml-live.log
+else
+ LOGFILE="$LOGDIR/grml-live.log"
+fi
+
+NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf
+
# }}}
# some important functions {{{
echo "
$PN - build process script for generating a (grml based) Linux Live-ISO
-Usage: $PN [-c <classe[s]>] [-g <grml_name>] [-i <iso_name> ] \\
- [-o <output_directory>] [-s <suite>] [-t <template_directory>] \\
- [-s <suite>] [-v <version_number>] [-FVh]
+Usage: $PN [-a <architecture>] [-c <classe[s]>] [-g <grml_name>] \\
+ [-i <iso_name> ] [-o <output_directory>] [-s <suite>] \\
+ [-t <template_directory>] [-s <suite>] \\
+ [-v <version_number>] [-FVh]
Usage examples:
$PN -c GRMLBASE,GRML_SMALL,I386 -o /grml/
$PN -c GRMLBASE,GRML_MEDIUM,I386 -o /dev/shm/grml
$PN -c GRMLBASE,GRML_SMALL,I386 -g grml-small -v 1.0
- $PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso
- $PN -c GRMLBASE,GRML_FULL,I386 -s sid -V
+ $PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso -v 0.0-1
+ $PN -c GRMLBASE,GRML_FULL,I386 -s sid -V -r 'grml-live rocks'
More details: man grml-live
/usr/share/doc/grml-live/grml-live.html
fi
if [ -n "$FAI_DEBOOTSTRAP" ] ; then
- sed -i "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$FAI_DEBOOTSTRAP\"#" /etc/grml/fai/make-fai-nfsroot.conf
+ sed -i "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$FAI_DEBOOTSTRAP\"#" $NFSROOT_CONF
fi
# does this suck? YES!
sed -i "s/\(deb .\+\)\([ \t]+\)$DIST\([ \t]+\)\(main \)/\1\2 $SUITE \3\4/" /etc/grml/fai/apt/sources.list
sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF
- sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" /etc/grml/fai/make-fai-nfsroot.conf
+ sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $NFSROOT_CONF
fi
-if [ "$(dpkg --print-architecture)" != "$ARCH" ] ; then
- if ! grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' /etc/grml/fai/make-fai-nfsroot.conf ; then
- sed -i "s|FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" /etc/grml/fai/make-fai-nfsroot.conf
- fi
+# set $ARCH
+[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
+if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' $NFSROOT_CONF ; then
+ sed -i "s/--arch [a-z0-9]* /--arch $ARCH /" $NFSROOT_CONF
+else
+ sed -i "s|FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" $NFSROOT_CONF
fi
# }}}
[ -n "$BUILD_OUTPUT" ] || BUILD_OUTPUT="$OUTPUT/grml_cd"
mkdir -p "$BUILD_OUTPUT" || bailout 6 "Problem with creating $BUILD_OUTPUT for stage ARCH"
-[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
-
# i386:
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
if [ -d "$BUILD_OUTPUT"/boot ] ; then