From: Michael Prokop Date: Sun, 25 Nov 2007 15:41:49 +0000 (+0100) Subject: Adjust logfile handling for new FAI; support grml2ram bootoption X-Git-Tag: 0.0.10~16 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=012959f08d005f80332adfaf19bda235f7009954 Adjust logfile handling for new FAI; support grml2ram bootoption --- diff --git a/debian/changelog b/debian/changelog index 3a5f5df..e1fd873 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ grml-live (0.0.10) unstable; urgency=low * Drop patches which are part of FAI 3.2.3 now. Depend on FAI version 3.2.3 therefor. + * FAI 3.2.3 has a new log schema, adjusted grml-live accordingly. + Quoting the NEWS file of FAI: + - LOGDIR is now /var/log/fai/$HOSTNAME/$FAI_ACTION_date+time + - LOGDIR is /tmp/fai during an installation (not dirinstall), and + will be copied to the path above at the end of an installation * Do not enable apt-listbugs if the binary is not available. [Testing: issue340] * Add keychain package to GRML_MEDIUM. @@ -14,6 +19,8 @@ grml-live (0.0.10) unstable; urgency=low * Switch order of 'lang=us apm=power-off' to 'apm=poweroff' in isolinyx/syslinux/grub configuration because getbootparam of grml-autoconfig requires a whitespace inside /proc/cmdline. + * Support grml2ram bootoption inside isolinyx/syslinux/grub + configuration. -- Michael Prokop Mon, 19 Nov 2007 12:49:37 +0100 diff --git a/docs/grml-live.txt b/docs/grml-live.txt index f3274bc..b36947d 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -304,14 +304,11 @@ Available log files grml-live itself logs to /var/log/grml-live.log. Unless you set ZERO_LOGFILE in /etc/grml/grml-live.conf the output is appended to the file. If you set the -ZERO_LOGFILE configuration option the logfile will be truncated on a new +ZERO_LOGFILE configuration option the logfile will be truncated on each new invocation of grml-live. -The FAI part of grml-live logs to /var/log/fai/dirinstall/$HOSTNAME - so the -default being /var/log/fai/dirinstall/grml. - -If you are using the update option of grml-live (option -u) the logs are -available at /var/log/fai/current. +The FAI part of grml-live logs to /var/log/fai/$HOSTNAME/ - so the +default being /var/log/fai/grml/. If you are using the grml-live buildd you will find the logs of the grml-live run at /var/log/grml-buildd.stdout and /var/log/grml-buildd.stderr. @@ -339,9 +336,10 @@ FAQ Help, I'm using Debian etch and I don't have FAI version >3.2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - wget http://www.informatik.uni-koeln.de/fai/download/etch/fai-client_3.2.1_all.deb \ - http://www.informatik.uni-koeln.de/fai/download/etch/fai-server_3.2.1_all.deb - dpkg -i fai-client_3.2.1_all.deb fai-server_3.2.1_all.deb + wget http://www.informatik.uni-koeln.de/fai/download/etch/fai-client_3.2.3_all.deb \ + http://www.informatik.uni-koeln.de/fai/download/etch/fai-server_3.2.3_all.deb \ + http://www.informatik.uni-koeln.de/fai/download/etch/fai-doc_3.2.3_all.deb + dpkg -i fai-client_3.2.3_all.deb fai-server_3.2.3_all.deb fai-doc_3.2.3_all.deb or check out the link:http://www.informatik.uni-koeln.de/fai/[FAI-homepage] for further details. @@ -349,14 +347,14 @@ further details. I've problems with the build process. How to start debugging? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Check out the logs inside /var/log/fai/dirinstall/... If you don't have the time -to debug the problem in further detail or don't know how to proceed just send a -copy of your config, logs and the commandline with a short problem description -to : +Check out the logs inside /var/log/fai/... If you don't have the time to debug +the problem in further detail or don't know how to proceed just send a copy of +your config, logs and the commandline with a short problem description to +: # history | grep grml-live > /etc/grml/grml_live.cmdline # tar zcf grml_live_problem.tar.gz /etc/grml/grml-live.conf \ - /var/log/fai/dirinstall /etc/grml/fai + /etc/grml/grml-buildd.conf /var/log/fai /etc/grml/fai Can I use my own (local) Debian mirror? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/grml-live b/grml-live index 9c55ab6..ca826c6 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: Mon Nov 05 09:24:45 CET 2007 [mika] +# Latest change: Sun Nov 25 16:35:35 CET 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -15,7 +15,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.0.7' +GRML_LIVE_VERSION='0.0.10' CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -341,11 +341,7 @@ else # notice: 'fai dirinstall' does not seem to exit appropriate, so: ERROR='' - if [ -n "$UPDATE" ] ; then - CHECKLOG=/var/log/fai/current/ - else - CHECKLOG=/var/log/fai/dirinstall/$HOSTNAME/ - fi + CHECKLOG=/var/log/fai/$HOSTNAME/last if [ -r "$CHECKLOG/software.log" ] ; then # 1 errors during executing of commands # Unable to write mmap - msync (28 No space left on device) diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst index 3fee5d6..7cd38df 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -36,6 +36,14 @@ title %GRML_NAME% %VERSION% - debug mode kernel /boot/isolinux/linux26 apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce initrd /boot/isolinux/initrd.gz +title %GRML_NAME% %VERSION% - copy grml squashfs file to RAM +kernel /boot/isolinux/linux26 toram=grml.squashfs apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/isolinux/initrd.gz + +title %GRML_NAME% %VERSION% - copy medium to RAM +kernel /boot/isolinux/linux26 toram apm=power-off lang=us vga=791 quiet boot=live nomce +initrd /boot/isolinux/initrd.gz + title %GRML_NAME% %VERSION% - forensic mode kernel /boot/isolinux/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live initrd /boot/isolinux/initrd.gz diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index b3597a2..f6948d7 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -29,8 +29,14 @@ MENU LABEL grml - Standard Bootup MENU DEFAULT KERNEL linux26 APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce -# APPEND apm=power-off lang=us vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce +LABEL grml2ram +MENU LABEL grml2ram - Copy Squashfs file to RAM +MENU DEFAULT +KERNEL linux26 +APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce + +# deprecated: LABEL old MENU LABEL old KERNEL linux26 diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg index 6c3e0ab..976365d 100644 --- a/templates/boot/isolinux/syslinux.cfg +++ b/templates/boot/isolinux/syslinux.cfg @@ -29,8 +29,14 @@ MENU LABEL grml - Standard Bootup MENU DEFAULT KERNEL linux26 APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce -# APPEND apm=power-off lang=us vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce +LABEL grml2ram +MENU LABEL grml2ram - Copy Squashfs file to RAM +MENU DEFAULT +KERNEL linux26 +APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce + +# deprecated: LABEL old MENU LABEL old KERNEL linux26