X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=832d44bdcd52414de23be4af4f9179c59809fd22;hp=4240aa1d928716e09a819cba8607d3fc5b1b4079;hb=ae03bb245582f7184394f2b7e254f4907cb2e4ab;hpb=5814000e2935205ebf42b7c17cf2e47b7f6b10dc diff --git a/grml-live b/grml-live index 4240aa1..832d44b 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: Sun Sep 16 23:47:55 CEST 2007 [mika] +# Latest change: Tue Sep 18 09:11:50 CEST 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -56,14 +56,15 @@ usage() echo " $PN - build process script for generating a (grml based) Linux Live-ISO -Usage: $PN [-c ] [-t ] [-F] [-h|--help] [additional_arguments_for_fai] +Usage: $PN [-c ] [-t ] [-s [-Fvh] Usage examples: $PN - $PN -c GRML,I386 -t /dev/shm/grml - $PN -c GRML,GRML_X,I386 -t /grml/ - $PN -c GRML,I386 + $PN -c GRMLBASE,GRML_X,I386 -t /grml/ + $PN -c GRMLBASE,I386 -t /dev/shm/grml + $PN -c GRMLBASE,GRML_SMALL,I386 + $PN -s sid -c GRMLBASE,I386 More details: man grml-live /usr/share/doc/grml-live/grml-live.html @@ -106,10 +107,10 @@ specify it on the command line using the -t|--target option." # ask user whether the setup is ok {{{ if [ -z "$FORCE" ] ; then echo - echo "$PN - check your configuration (or invoke using -F to force execution without prompting)" + echo "$PN - check your configuration (or invoke using -F to force execution without prompting):" echo echo " FAI classes: $CLASSES" - echo " output directory: $TARGET" + echo " main directory: $TARGET" [ -n "$CHROOT_TARGET" ] && echo " chroot target: $CHROOT_TARGET" [ -n "$BUILD_TARGET" ] && echo " build target: $BUILD_TARGET" [ -n "$ISO_TARGET" ] && echo " ISO target: $ISO_TARGET" @@ -131,7 +132,8 @@ if [ -n "$GRML_LIVE_SOURCES" ] ; then echo "$GRML_LIVE_SOURCES" > /etc/grml/fai/apt/sources.list fi -# we assume that it is set to 'etch' by default +# this heuristic is broken as it works exactly *once* by default :-/ +# TODO / FIXME if [ -n "$SUITE" ] ; then sed -i "s#etch #$SUITE #" /etc/grml/fai/make-fai-nfsroot.conf sed -i "s#etch #$SUITE #" /etc/grml/grml-live.conf @@ -154,7 +156,14 @@ else fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true umount $CHROOT_TARGET/sys 2>/dev/null || /bin/true - echo " [*] Finished execution of stage 'fai dirinstall'" + # notice: 'fai dirinstall' does not seem to exit appropriate -> + # we need better error handling + if [ -r "$CHROOT_TARGET"/etc/grml_cd ] ; then + echo " [*] Finished execution of stage 'fai dirinstall'" + else + echo " [!] There was an error during execution of stage 'fai dirinstall'" + exit 1 + fi fi # }}} @@ -162,31 +171,37 @@ fi [ -n "$BUILD_TARGET" ] || BUILD_TARGET="$TARGET/grml_cd" mkdir -p "$BUILD_TARGET" || bailout 6 "Problem with creating $BUILD_TARGET for stage ARCH" -# x86: -if [ "$ARCH" = x86 ] ; then +# i386: +[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)" +if [ "$ARCH" = i386 ] ; then if [ -d "$BUILD_TARGET"/boot/isolinux ] ; then echo " [x] $BUILD_TARGET/boot/isolinux exists already - skipping stage 'boot/isolinux'" continue else + # booting stuff: mkdir -p "$BUILD_TARGET"/boot/isolinux mkdir "$BUILD_TARGET"/GRML - cp /boot/memtest86+.bin "$BUILD_TARGET"/boot/isolinux/memtest - cp "$CHROOT_TARGET"/boot/initrd* "$BUILD_TARGET"/boot/isolinux/initrd.gz - cp "$CHROOT_TARGET"/boot/vmlinuz* "$BUILD_TARGET"/boot/isolinux/linux26 - cp /usr/lib/syslinux/chain.c32 "$BUILD_TARGET"/boot/isolinux/ - 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/x86_files/boot/isolinux/allinone.img "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/balder10.imz "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/boot-beep.msg "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/boot.msg "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/f* "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/isolinux.cfg "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/logo.16 "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/x86_files/boot/isolinux/syslinux.cfg "$BUILD_TARGET"/boot/isolinux/ - # minirt26.gz - # boot.cat + cp /boot/memtest86+.bin "$BUILD_TARGET"/boot/isolinux/memtest + cp "$CHROOT_TARGET"/boot/initrd* "$BUILD_TARGET"/boot/isolinux/initrd.gz + cp "$CHROOT_TARGET"/boot/vmlinuz* "$BUILD_TARGET"/boot/isolinux/linux26 + cp /usr/lib/syslinux/chain.c32 "$BUILD_TARGET"/boot/isolinux/ + 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/ + # 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"/ + cp /usr/share/grml-live/windows/autostart/autorun.pif "$BUILD_TARGET"/ + cp /usr/share/grml-live/windows/autostart/cdrom.ico "$BUILD_TARGET"/ + # windows-binaries: if [ -n "$WINDOWS_BINARIES" ] ; then if [ -d "$BUILD_TARGET"/windows ] ; then echo " [x] $BUILD_TARGET/windows exists already - skipping stage 'WINDOWS_BINARIES'" @@ -244,4 +259,4 @@ bailout 0 # }}} ## END OF FILE ################################################################# -# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=2 +# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=3