From: Christian Hofstaedtler Date: Mon, 14 Nov 2011 19:14:51 +0000 (+0100) Subject: Merge branch 'ch/installrescue' X-Git-Tag: v0.17.0~108 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=2848346519849550d686b9dc78f4a0da73f413ac;hp=45b4f73da4e92cd62133719480c23d846d4cb072 Merge branch 'ch/installrescue' --- diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh index d0e6fe7..93457ab 100755 --- a/buildd/cleanup.sh +++ b/buildd/cleanup.sh @@ -22,9 +22,8 @@ if [ -z "$MIRROR_DIRECTORY" ] ; then exit 1 fi -# mail address where reports should be sent to -if [ -z "$STORAGE_ADMIN" ] ; then - echo "Error: \$STORAGE_ADMIN is not set. Exiting." >&2 +if [ -z "$FLAVOURS" ] ; then + echo "Error: \$FLAVOURS is not set. Exiting." >&2 exit 2 fi @@ -39,9 +38,7 @@ fi DAYS=3 REMOVE_ME="" -for flavour in grml-medium_squeeze grml-medium_wheezy grml-medium_sid grml-small_squeeze grml-small_wheezy grml-small_sid \ - grml64-medium_squeeze grml64-medium_wheezy grml64-medium_sid grml64-small_squeeze grml64-small_wheezy grml64-small_sid \ - grml64_squeeze grml64_wheezy grml64_sid grml_squeeze grml_wheezy grml_sid ; do +for flavour in $FLAVOURS; do FILE_COUNT=$(ls -1 $flavour/$flavour*.iso | wc -l) if [ "$FILE_COUNT" -gt "$DAYS" ] ; then FILES=$(ls -1 $flavour/$flavour*.iso | tail -"$DAYS") @@ -63,7 +60,7 @@ done # inform on successful removal: if [ "$(echo "$REMOVE_ME" | tr -d ' ' )" != "" ] ; then - echo "deleted files $REMOVE_ME" | mail -s "daily-builds cleanup script" "$STORAGE_ADMIN" + echo "Removed previous files $REMOVE_ME" | logger -t grml-buildd fi ## END OF FILE ################################################################# diff --git a/buildd/cronjob.sh b/buildd/cronjob.sh index 3ed1c5e..540293a 100755 --- a/buildd/cronjob.sh +++ b/buildd/cronjob.sh @@ -39,10 +39,10 @@ echo $$ > /usr/share/grml-live/buildd/buildd_running /usr/share/grml-live/buildd/upload_isos.sh && \ /usr/share/grml-live/buildd/remove_isos.sh -/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_wheezy.sh && \ -/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_sid.sh && \ -/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_wheezy.sh && \ -/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_sid.sh +/usr/share/grml-live/buildd/grml-live_autobuild_grml64-full_wheezy.sh && \ +/usr/share/grml-live/buildd/grml-live_autobuild_grml64-full_sid.sh && \ +/usr/share/grml-live/buildd/grml-live_autobuild_grml-full_wheezy.sh && \ +/usr/share/grml-live/buildd/grml-live_autobuild_grml-full_sid.sh /usr/share/grml-live/buildd/upload_isos.sh && \ /usr/share/grml-live/buildd/remove_isos.sh diff --git a/buildd/files/index.html b/buildd/files/index.html index 278a8a1..8435c6e 100644 --- a/buildd/files/index.html +++ b/buildd/files/index.html @@ -75,10 +75,10 @@ snapshots.

The base.tgz files can be used for the base chroot/debootstrap system within grml-live. Place base.tgz (sha1: 2318db46929f01d8d47f1b4849b6d97e04d7fdc4) +href="base.tgz">base.tgz (sha1: bd56643b9fde160a39729f50c81a8e2b91810d5e) as /etc/grml/fai/config/basefiles/I386.tar.gz and base64.tgz (sha1: -a696423e6e94c897cf41940d1d49b732cb4cd6bb) as +href="base64.tgz">base64.tgz (sha1: +5d479b2533e77da27b28456c5b8a1817cb440010) as /etc/grml/fai/config/basefiles/AMD64.tar.gz

Contact

diff --git a/buildd/functions.sh b/buildd/functions.sh index db93bbb..9aa4cd6 100755 --- a/buildd/functions.sh +++ b/buildd/functions.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Filename: /usr/share/grml-live/buildd/functions.sh # Purpose: main function file for grml-live buildd # Authors: grml-team (grml.org), (c) Michael Prokop @@ -66,10 +66,13 @@ grml_live_run() { grml_name="$NAME-daily-$CODENAME" shortdate="$(date +%y%m%d)" + TIME_START=$(date +%s) grml-live -F $* -a $ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \ -g "$grml_name" -v "$shortdate" -r grml-live-autobuild -i $ISO_NAME \ >/var/log/grml-buildd.stdout \ 2>/var/log/grml-buildd.stderr ; RC=$? + TIME_END=$(date +%s) + WALLTIME=$(($TIME_END-$TIME_START)) if [ "$RC" = "0" ] ; then RC_INFO=success @@ -108,11 +111,12 @@ send_mail() { # attach logs only if we have some: [ -r "$ATTACHMENT" ] && MUTT_ATTACH="-a $ATTACHMENT" || MUTT_ATTACH='' - echo -en "Automatically generated mail by $SCRIPTNAME + echo "Automatically generated mail by $SCRIPTNAME $ISO_DETAILS -Return code of grml-live run was: $RC +Return code of grml-live was: $RC +Time: $WALLTIME $(grep -A2 'Executed grml-live' $GRML_LOGFILE || echo "* executed grml-live command line not available") @@ -120,7 +124,7 @@ $(grep -A2 'Executed FAI' $GRML_LOGFILE || echo "* executed FAI command line not The following errors have been noticed (several might be warnings only): -$(grep -i error $FAI_LOGFILES/* /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error || echo "* nothing") +$(grep -i error $FAI_LOGFILES/*.log /var/log/grml-buildd.std* | grep -ve liberror -ve libgpg-error -ve libcomerr -ve 'no errors found' || echo "* nothing") The following errors have been noticed in FAI scripts: diff --git a/buildd/grml-buildd.conf b/buildd/grml-buildd.conf index 4ba67c6..63c082d 100644 --- a/buildd/grml-buildd.conf +++ b/buildd/grml-buildd.conf @@ -37,6 +37,15 @@ # used for example inside /usr/share/grml-live/buildd/cleanup.sh #MIRROR_DIRECTORY=/srv/mirror/www.grml.org/daily +# which flavours are built +#FLAVOURS=" \ +# grml-small_wheezy grml-small_sid \ +# grml-medium_wheezy grml-medium_sid \ +# grml_wheezy grml_sid \ +# grml64-small_wheezy grml64-small_sid \ +# grml64-medium_wheezy grml64-medium_sid \ +# grml64_wheezy grml64_sid \ +# " ## END OF FILE ################################################################# diff --git a/buildd/grml-live_autobuild_grml-large_sid.sh b/buildd/grml-live_autobuild_grml-full_sid.sh similarity index 100% rename from buildd/grml-live_autobuild_grml-large_sid.sh rename to buildd/grml-live_autobuild_grml-full_sid.sh diff --git a/buildd/grml-live_autobuild_grml-large_squeeze.sh b/buildd/grml-live_autobuild_grml-full_squeeze.sh similarity index 100% rename from buildd/grml-live_autobuild_grml-large_squeeze.sh rename to buildd/grml-live_autobuild_grml-full_squeeze.sh diff --git a/buildd/grml-live_autobuild_grml-large_wheezy.sh b/buildd/grml-live_autobuild_grml-full_wheezy.sh similarity index 100% rename from buildd/grml-live_autobuild_grml-large_wheezy.sh rename to buildd/grml-live_autobuild_grml-full_wheezy.sh diff --git a/buildd/grml-live_autobuild_grml-small_sid.sh b/buildd/grml-live_autobuild_grml-small_sid.sh index dc5d09d..387e157 100755 --- a/buildd/grml-live_autobuild_grml-small_sid.sh +++ b/buildd/grml-live_autobuild_grml-small_sid.sh @@ -4,7 +4,7 @@ DATE=$(date +%Y%m%d) ISO_NAME=grml-small_sid_$DATE.iso SUITE=sid -CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,I386,IGNORE' +CLASSES='GRMLBASE,GRML_SMALL,RELEASE,I386,IGNORE' NAME=grml-small SCRIPTNAME="$(basename $0)" ARCH=i386 diff --git a/buildd/grml-live_autobuild_grml-small_squeeze.sh b/buildd/grml-live_autobuild_grml-small_squeeze.sh index 7ca4c03..a851d12 100755 --- a/buildd/grml-live_autobuild_grml-small_squeeze.sh +++ b/buildd/grml-live_autobuild_grml-small_squeeze.sh @@ -4,7 +4,7 @@ DATE=$(date +%Y%m%d) ISO_NAME=grml-small_squeeze_$DATE.iso SUITE=squeeze -CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,I386,IGNORE' +CLASSES='GRMLBASE,GRML_SMALL,RELEASE,I386,IGNORE' NAME=grml-small SCRIPTNAME="$(basename $0)" ARCH=i386 diff --git a/buildd/grml-live_autobuild_grml-small_wheezy.sh b/buildd/grml-live_autobuild_grml-small_wheezy.sh index 8886c97..d2131ac 100755 --- a/buildd/grml-live_autobuild_grml-small_wheezy.sh +++ b/buildd/grml-live_autobuild_grml-small_wheezy.sh @@ -4,7 +4,7 @@ DATE=$(date +%Y%m%d) ISO_NAME=grml-small_wheezy_$DATE.iso SUITE=wheezy -CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,I386,IGNORE' +CLASSES='GRMLBASE,GRML_SMALL,RELEASE,I386,IGNORE' NAME=grml-small SCRIPTNAME="$(basename $0)" ARCH=i386 diff --git a/buildd/grml-live_autobuild_grml64-large_sid.sh b/buildd/grml-live_autobuild_grml64-full_sid.sh similarity index 100% rename from buildd/grml-live_autobuild_grml64-large_sid.sh rename to buildd/grml-live_autobuild_grml64-full_sid.sh diff --git a/buildd/grml-live_autobuild_grml64-large_squeeze.sh b/buildd/grml-live_autobuild_grml64-full_squeeze.sh similarity index 100% rename from buildd/grml-live_autobuild_grml64-large_squeeze.sh rename to buildd/grml-live_autobuild_grml64-full_squeeze.sh diff --git a/buildd/grml-live_autobuild_grml64-large_wheezy.sh b/buildd/grml-live_autobuild_grml64-full_wheezy.sh similarity index 100% rename from buildd/grml-live_autobuild_grml64-large_wheezy.sh rename to buildd/grml-live_autobuild_grml64-full_wheezy.sh diff --git a/buildd/grml-live_autobuild_grml64-small_sid.sh b/buildd/grml-live_autobuild_grml64-small_sid.sh index a458dd2..ad7bdab 100755 --- a/buildd/grml-live_autobuild_grml64-small_sid.sh +++ b/buildd/grml-live_autobuild_grml64-small_sid.sh @@ -4,7 +4,7 @@ DATE=$(date +%Y%m%d) ISO_NAME=grml64-small_sid_$DATE.iso SUITE=sid -CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,AMD64,IGNORE' +CLASSES='GRMLBASE,GRML_SMALL,RELEASE,AMD64,IGNORE' NAME=grml64-small SCRIPTNAME="$(basename $0)" ARCH=amd64 diff --git a/buildd/grml-live_autobuild_grml64-small_squeeze.sh b/buildd/grml-live_autobuild_grml64-small_squeeze.sh index fce93a4..ac8e594 100755 --- a/buildd/grml-live_autobuild_grml64-small_squeeze.sh +++ b/buildd/grml-live_autobuild_grml64-small_squeeze.sh @@ -4,7 +4,7 @@ DATE=$(date +%Y%m%d) ISO_NAME=grml64-small_squeeze_$DATE.iso SUITE=squeeze -CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,AMD64,IGNORE' +CLASSES='GRMLBASE,GRML_SMALL,RELEASE,AMD64,IGNORE' NAME=grml64-small SCRIPTNAME="$(basename $0)" ARCH=amd64 diff --git a/buildd/grml-live_autobuild_grml64-small_wheezy.sh b/buildd/grml-live_autobuild_grml64-small_wheezy.sh index 01ecdbe..f4ba354 100755 --- a/buildd/grml-live_autobuild_grml64-small_wheezy.sh +++ b/buildd/grml-live_autobuild_grml64-small_wheezy.sh @@ -4,7 +4,7 @@ DATE=$(date +%Y%m%d) ISO_NAME=grml64-small_wheezy_$DATE.iso SUITE=wheezy -CLASSES='GRMLBASE,GRML_SMALL,REMOVE_DOCS,RELEASE,AMD64,IGNORE' +CLASSES='GRMLBASE,GRML_SMALL,RELEASE,AMD64,IGNORE' NAME=grml64-small SCRIPTNAME="$(basename $0)" ARCH=amd64 diff --git a/buildd/link_latest.sh b/buildd/link_latest.sh index a6c22ee..92a2ea5 100755 --- a/buildd/link_latest.sh +++ b/buildd/link_latest.sh @@ -22,15 +22,18 @@ if [ -z "$MIRROR_DIRECTORY" ] ; then exit 1 fi +if [ -z "$FLAVOURS" ] ; then + echo "Error: \$FLAVOURS is not set. Exiting." >&2 + exit 2 +fi + if ! cd "$MIRROR_DIRECTORY" ; then echo "Error: could not change directory to $MIRROR_DIRECTORY" >&2 exit 1 fi echo "---------------------------" >> "$MIRROR_DIRECTORY"/.timestamp_link -for flavour in grml-medium_squeeze grml-medium_wheezy grml-medium_sid grml-small_squeeze grml-small_wheezy grml-small_sid \ - grml64-medium_squeeze grml64-medium_wheezy grml64-medium_sid grml64-small_squeeze grml64-small_wheezy grml64-small_sid \ - grml64_squeeze grml64_wheezy grml64_sid grml_squeeze grml_wheezy grml_sid ; do +for flavour in $FLAVOURS; do ISO="$(ls -1 $flavour/*.iso | tail -1)" if [ -n "$ISO" ] ; then latest="$(basename ${ISO%%_[0-9]*})_latest.iso" diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh index 29960ae..a18d3e3 100755 --- a/buildd/upload_isos.sh +++ b/buildd/upload_isos.sh @@ -9,6 +9,7 @@ . /etc/grml/grml-buildd.conf || exit 1 [ -n "$RSYNC_MIRROR" ] || exit 2 [ -n "$ISO_DIR" ] || exit 3 +[ -n "$FLAVOURS" ] || exit 5 cd $ISO_DIR || exit 4 @@ -19,13 +20,10 @@ for file in *.iso ; do chmod 664 "${file}" "${file}".md5 "${file}".sha1 done -for distri in squeeze wheezy sid ; do - for flavour in grml-small_$distri grml-medium_$distri grml_$distri \ - grml64-small_$distri grml64-medium_$distri grml64_$distri ; do - if ls $flavour* 1>/dev/null 2>&1 ; then - rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/ - fi - done +for flavour in $FLAVOURS; do + if ls $flavour* 1>/dev/null 2>&1 ; then + rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/ + fi done ## END OF FILE ################################################################# diff --git a/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE b/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE index 53dfa03..9f365ab 100644 --- a/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE +++ b/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE @@ -25,11 +25,15 @@ 05 - S /etc/init.d/mountdevsubfs.sh 18 - S /etc/init.d/ifupdown-clean 29 - 2 /etc/init.d/bootlocal.middle +29 - 2,3,4,5 /etc/init.d/dbus +29 - 2,3,4,5 /etc/init.d/avahi-daemon 30 - 2,3,4,5 /etc/init.d/grml-autoconfig 36 - S /etc/init.d/ifupdown 36 - S /etc/init.d/udev-mtab 38 - S /etc/init.d/resolvconf 40 - S /etc/init.d/networking +41 - S /etc/init.d/rpcbind +42 - S /etc/init.d/nfs-common 55 - S /etc/init.d/bootmisc.sh 90 - 0 /etc/init.d/halt 90 - 6 /etc/init.d/reboot diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL index 97f8b66..f6723a1 100644 --- a/etc/grml/fai/config/package_config/GRML_FULL +++ b/etc/grml/fai/config/package_config/GRML_FULL @@ -52,7 +52,6 @@ afflib-tools afio aggregate aiccu -aircrack-ng ajaxterm alien alsa-base @@ -149,7 +148,6 @@ bfbtester biabam bin86 binclock -bind9 bind9-host binfmt-support bing @@ -381,7 +379,6 @@ elinks elvis elvis-common emacs -emuga encfs enscribe enscript @@ -393,8 +390,6 @@ eterm etherwake ethstatus ethtool -etpan-ng -ettercap-gtk evms evms-bootdebug evms-cli @@ -419,7 +414,7 @@ farpd fatattr fatresize fatsort -fbgrab +fbcat fbi fbset fbterm @@ -485,6 +480,7 @@ ghostscript giblib1 git git-email +gitk gitpkg git-svn gitweb @@ -582,6 +578,7 @@ imapfilter imediff2 imsniff im-switch +imvirt imwheel inadyn indent @@ -881,7 +878,6 @@ osiris os-prober oss-compat p0f -p3nfs p3scan p7zip packeth @@ -922,7 +918,6 @@ perl perl-doc perlmagick perl-modules -perl-suid perl-tk pfqueue pia @@ -1225,7 +1220,6 @@ tcptrack tcputils tcpxtract tcsh -tct tdl telak telnetd-ssl diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM index c2c64b3..05aa58f 100644 --- a/etc/grml/fai/config/package_config/GRML_MEDIUM +++ b/etc/grml/fai/config/package_config/GRML_MEDIUM @@ -68,6 +68,7 @@ grub-imageboot guessnet htop ifupdown +imvirt inetutils-inetd iproute iptraf @@ -181,10 +182,16 @@ zip zoo zsh +# accessibility testing +brltty +espeakup + PACKAGES aptitude I386 -linux-image-3.1.0-grml -virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11 +linux-image-3.1.0-1-grml-686-pae +#linux-image-3.1.0-grml +#virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11 PACKAGES aptitude AMD64 -linux-image-3.1.0-grml64 -virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11 +linux-image-3.1.0-1-grml-amd64 +#linux-image-3.1.0-grml64 +#virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11 diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL index e028802..2cbbd74 100644 --- a/etc/grml/fai/config/package_config/GRML_SMALL +++ b/etc/grml/fai/config/package_config/GRML_SMALL @@ -45,6 +45,7 @@ grub-imageboot guessnet htop ifupdown +imvirt inetutils-inetd iproute iputils-ping diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot index c2f3f77..6357c78 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot +++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot @@ -9,7 +9,7 @@ set -u set -e -if ! [ $(ls $target/boot/config-* 2>/dev/null) ] ; then +if ! ls $target/boot/config-* &>/dev/null ; then echo "No kernel config files (/boot/config-*) found. No kernel-image package installed?" >&2 exit 1 fi