X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=19b9cd1fc3c20bec9863c5d194459d39d630195a;hb=b087c1d4bc9cf861e318adb5d00b65658f57773f;hp=ae0e99e551c7404f6f77206c537f332870a58f9c;hpb=201df31e812c709b38316fb106cad8da54d0ff73;p=grml-live.git diff --git a/grml-live b/grml-live index ae0e99e..19b9cd1 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # 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. -# Latest change: Wed Sep 19 23:59:48 CEST 2007 [mika] +# Latest change: Fri Sep 21 17:00:20 CEST 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -56,13 +56,14 @@ trap bailout 1 2 3 15 [ -n "$HOSTNAME" ] || HOSTNAME=grml [ -n "$USERNAME" ] || USERNAME=grml [ -n "$CLASSES" ] || CLASSES="GRML,I386" +[ -n "$BOOT_METHOD" ] || BOOT_METHOD='isolinux' [ -n "$TARGET" ] || bailout 1 "${PN}: \$TARGET not specified. Please adjust $LIVE_CONF. Exiting." [ -n "$VERSION" ] || VERSION="0.0.1" [ -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" # }}} @@ -184,6 +185,7 @@ if [ -z "$FORCE" ] ; then [ -n "$BUILD_TARGET" ] && echo " build target: $BUILD_TARGET" [ -n "$ISO_TARGET" ] && echo " ISO target: $ISO_TARGET" [ -n "$SUITE" ] && echo " Debian suite: $SUITE" + [ -n "$BOOT_METHOD" ] && echo " Boot method: $BOOT_METHOD" [ -n "$FAI_ARGS" ] && echo " additional arguments for FAI: $FAI_ARGS" [ -n "$VERBOSE" ] && echo " Using VERBOSE mode." echo @@ -203,8 +205,8 @@ fi # 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 @@ -237,15 +239,15 @@ fi [ -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}" @@ -261,13 +263,13 @@ else 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 # }}} @@ -276,12 +278,13 @@ 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 - if [ -d "$BUILD_TARGET"/boot/isolinux ] ; then - ewarn "$BUILD_TARGET/boot exists already, skipping stage 'boot/isolinux'" ; eend 0 - log "$BUILD_TARGET/boot exists already, skipping stage 'boot/isolinux'" + +# i386: +if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then + if [ -d "$BUILD_TARGET"/boot ] ; then + 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 @@ -293,14 +296,9 @@ if [ "$ARCH" = i386 ] ; then cp /usr/lib/syslinux/isolinux.bin "$BUILD_TARGET"/boot/isolinux/ cp /usr/lib/syslinux/memdisk "$BUILD_TARGET"/boot/isolinux/ cp /usr/lib/syslinux/menu.c32 "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/allinone.img "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/balder10.imz "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/boot-beep.msg "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/boot.msg "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/f* "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/isolinux.cfg "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/logo.16 "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/syslinux.cfg "$BUILD_TARGET"/boot/isolinux/ + cp /usr/share/grml-live/i386_files/boot/isolinux/* "$BUILD_TARGET"/boot/isolinux/ + cp /usr/share/grml-live/i386_files/boot/isolinux/* "$BUILD_TARGET"/boot/isolinux/ + cp -a /usr/share/grml-live/i386_files/boot/grub "$BUILD_TARGET"/boot/ # adjust boot splash information: ISO_DATE="$(date +%Y-%m-%d)" @@ -315,6 +313,8 @@ if [ "$ARCH" = i386 ] ; then sed -i "s/%RELEASENAME%/$RELEASENAME/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg + sed -i "s/%VERSION%/$VERSION/" "$BUILD_TARGET"/boot/grub/menu.lst + # autostart for Windows: cp /usr/share/grml-live/windows/autostart/autorun.bat "$BUILD_TARGET"/ cp /usr/share/grml-live/windows/autostart/autorun.inf "$BUILD_TARGET"/ @@ -323,8 +323,8 @@ if [ "$ARCH" = i386 ] ; then # 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 @@ -332,14 +332,11 @@ if [ "$ARCH" = i386 ] ; then 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/isolinux'" ; eend 0 + 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 @@ -349,13 +346,13 @@ else 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 # }}} @@ -363,19 +360,32 @@ fi [ -n "$ISO_TARGET" ] || ISO_TARGET="$TARGET/grml_isos" [ -n "$ISO_NAME" ] || ISO_NAME="grml_${VERSION}.iso" +if [ "$BOOT_METHOD" = "isolinux" ] ; then + BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat" +elif [ "$BOOT_METHOD" = "grub" ] ; then + BOOT_FILE="boot/grub/stage2_eltorito" +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 \ - -c boot/isolinux/boot.cat -b boot/isolinux/isolinux.bin \ - -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 # }}}