# 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: Thu Sep 20 13:25:31 CEST 2007 [mika]
+# Latest change: Fri Sep 21 17:00:20 CEST 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
[ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
[ -n "$LOGDIR" ] || LOGDIR="/var/log/fai/dirinstall/$HOSTNAME"
-[ -d "$LOGDIR" ] || mkdir $LOGDIR
+[ -d "$LOGDIR" ] || mkdir -p $LOGDIR
LOGFILE="$LOGDIR/grml-live.conf"
# }}}
# on-the-fly configuration {{{
if [ -n "$MIRROR_DIRECTORY" ] ; then
if ! [ -d "$MIRROR_DIRECTORY/debian" ] ; then
- eerror "Sorry, $MIRROR_DIRECTORY/debian does not seem to exist. Exiting."
log "Sorry, $MIRROR_DIRECTORY/debian does not seem to exist. Exiting. [$(date)]"
+ eerror "Sorry, $MIRROR_DIRECTORY/debian does not seem to exist. Exiting."
bailout 1
fi
echo "$MIRROR_SOURCES" > /etc/grml/fai/apt/sources.list
[ -n "$CHROOT_TARGET" ] || CHROOT_TARGET="$TARGET/grml_chroot"
if [ -d "$CHROOT_TARGET/bin" ] ; then
- ewarn "$CHROOT_TARGET exists already, skipping stage 'fai dirinstall'" ; eend 0
log "$CHROOT_TARGET exists already, skipping stage 'fai dirinstall'"
+ ewarn "$CHROOT_TARGET exists already, skipping stage 'fai dirinstall'" ; eend 0
else
mkdir -p "$CHROOT_TARGET" || bailout 5 "Problem with creating $CHROOT_TARGET for FAI"
if [ -n "${MIRROR_DIRECTORY}" ] ; then
mkdir -p "${CHROOT_TARGET}/${MIRROR_DIRECTORY}"
mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_TARGET}/${MIRROR_DIRECTORY}"
fi
- fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS | tee -a $LOGFILE
+ fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" dirinstall "$CHROOT_TARGET" $FAI_ARGS | tee -a $LOGFILE
umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true
umount $CHROOT_TARGET/sys 2>/dev/null || /bin/true
[ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_TARGET}/${MIRROR_DIRECTORY}"
fi
if [ -n "$ERROR" ] ; then
- eerror "There was an error during execution of stage 'fai dirinstall'"
- echo " Check out /var/log/fai/dirinstall/$HOSTNAME/... for details. [exit ${ERROR}]"
log "There was an error during execution of stage 'fai dirinstall' [$(date)]"
+ eerror "There was an error during execution of stage 'fai dirinstall'"
+ echo " Check out /var/log/fai/dirinstall/$HOSTNAME/ for details. [exit ${ERROR}]"
eend 1 ; exit 1
else
- einfo "Finished execution of stage 'fai dirinstall'"
log "Finished execution of stage 'fai dirinstall' [$(date)]"
+ einfo "Finished execution of stage 'fai dirinstall'"
fi
fi
# }}}
[ -n "$BUILD_TARGET" ] || BUILD_TARGET="$TARGET/grml_cd"
mkdir -p "$BUILD_TARGET" || bailout 6 "Problem with creating $BUILD_TARGET for stage ARCH"
-# i386:
[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
-if [ "$ARCH" = i386 ] ; then
+
+# i386:
+if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
if [ -d "$BUILD_TARGET"/boot ] ; then
- ewarn "$BUILD_TARGET/boot exists already, skipping stage 'boot'" ; eend 0
log "$BUILD_TARGET/boot exists already, skipping stage 'boot'"
+ ewarn "$BUILD_TARGET/boot exists already, skipping stage 'boot'" ; eend 0
else
# booting stuff:
mkdir -p "$BUILD_TARGET"/boot/isolinux
# windows-binaries:
if [ -n "$WINDOWS_BINARIES" ] ; then
if [ -f "$BUILD_TARGET"/windows/putty.exe ] ; then
- ewarn "$BUILD_TARGET/windows exists already, skipping stage 'WINDOWS_BINARIES'" ; eend 0
log "$BUILD_TARGET/windows exists already, skipping stage 'WINDOWS_BINARIES'"
+ ewarn "$BUILD_TARGET/windows exists already, skipping stage 'WINDOWS_BINARIES'" ; eend 0
else
mkdir "$BUILD_TARGET"/windows
( cd "$BUILD_TARGET"/windows
wget -O ${file}.exe ${WINDOWS_BINARIES}/${file}.exe
done )
fi
- einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0
log "Finished execution of stage 'WINDOWS_BINARIES' [$(date)]"
+ einfo "Finished execution of stage 'WINDOWS_BINARIES'" ; eend 0
fi
einfo "Finished execution of stage 'boot'" ; eend 0
fi
-# amd64:
-elif [ "$ARCH" = amd64 ] ; then
- ewarn 'Warning: gebi, it is your turn. :)'>&2
# ppc:
elif [ "$ARCH" = powerpc ] ; then
ewarn 'Warning: formorer, it is your turn. :)'>&2
fi
if [ -f "$BUILD_TARGET"/live/grml.squashfs ] ; then
- ewarn "$BUILD_TARGET/live exists already, skipping stage 'squashfs'" ; eend 0
log "$BUILD_TARGET/live exists already, skipping stage 'squashfs'"
+ ewarn "$BUILD_TARGET/live exists already, skipping stage 'squashfs'" ; eend 0
else
mkdir "$BUILD_TARGET"/live
mksquashfs $CHROOT_TARGET/* $BUILD_TARGET/live/grml.squashfs -noappend
- einfo "Finished execution of stage 'squashfs'" ; eend 0
log "Finished execution of stage 'squashfs' [$(date)]"
+ einfo "Finished execution of stage 'squashfs'" ; eend 0
fi
# }}}
fi
if [ -f "${ISO_TARGET}/${ISO_NAME}" ] ; then
- ewarn "$ISO_TARGET exists already, skipping stage 'iso build'" ; eend 0
log "$ISO_TARGET exists already, skipping stage 'iso build'"
+ ewarn "$ISO_TARGET exists already, skipping stage 'iso build'" ; eend 0
else
mkdir -p "$ISO_TARGET" || bailout 6 "Problem with creating $ISO_TARGET for stage 'iso build'"
- ( cd "$BUILD_TARGET" &&
- mkisofs -V "grml $VERSION" -publisher 'grml-live | grml.org' \
- -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table \
- -b $BOOT_FILE \
- -o "${ISO_TARGET}/${ISO_NAME}" .
- )
- einfo "Finished execution of stage 'iso build'" ; eend 0
- log "Finished execution of stage 'iso build' [$(date)]"
+ CURRENT_DIR=$(pwd)
+ cd "$BUILD_TARGET" &&
+ mkisofs -V "grml $VERSION" -publisher 'grml-live | grml.org' \
+ -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table \
+ -b $BOOT_FILE \
+ -o "${ISO_TARGET}/${ISO_NAME}" . ; RC=$?
+ cd $CURRENT_DIR
+ if [ "$RC" = 0 ] ; then
+ log "Finished execution of stage 'iso build' [$(date)]"
+ einfo "Finished execution of stage 'iso build'" ; eend 0
+ else
+ log "There was an error ($RC) executing stage 'iso build' [$(date)]"
+ eerror "There was an error executing stage 'iso build'" ; eend 1
+ bailout $RC
+ fi
fi
# }}}