X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=02409727082149ac9766a39d87c36d9896fc1ae2;hp=d66c9952a8f1f101d89aee992ebde8769797fb80;hb=563f2f26944598d6c061044da3cbea08fdd7957b;hpb=bbc4b9db068e7ed536161680c84fbed328ddb3af diff --git a/grml-live b/grml-live index d66c995..0240972 100755 --- a/grml-live +++ b/grml-live @@ -392,7 +392,7 @@ if [ -n "$MIRROR_DIRECTORY" ] ; then # NOTE: This file is *NOT* meant for manual customisation! This file is # modified by grml-live and any changes might be overriden. # You might consider using GRML_LIVE_SOURCES in /etc/grml/grml-live.conf* -# and using /etc/grml/fai/files/etc/apt instead!' +# or FAI's fcopy command with /etc/grml/fai/config/files instead! EOF echo "$MIRROR_SOURCES" >> "$SOURCES_LIST_FILE" if [ -n "$GRML_LIVE_SOURCES" ] ; then @@ -403,7 +403,7 @@ elif [ -n "$GRML_LIVE_SOURCES" ] ; then # NOTE: This file is *NOT* meant for manual customisation! This file is # modified by grml-live and any changes might be overriden. # You might consider using GRML_LIVE_SOURCES in /etc/grml/grml-live.conf* -# and using /etc/grml/fai/files/etc/apt instead!' +# or FAI's fcopy command with /etc/grml/fai/config/files instead! EOF echo "$GRML_LIVE_SOURCES" >> "$SOURCES_LIST_FILE" fi @@ -593,7 +593,7 @@ CHECKLOG=/var/log/fai/$HOSTNAME/last # package validator if [ -r "$CHECKLOG/package_errors.log" ] && grep -q '[a-z]' "$CHECKLOG/package_errors.log" ; then - if [ -n "$EXIT_ON_MISSING_PACKAGES" ] ; then + if [ -n "$EXIT_ON_MISSING_PACKAGES" -a -z "$BUILD_DIRTY" ] ; then eerror "The following packages were requested for installation but could not be processed:" cat $CHECKLOG/package_errors.log eerror "... exiting as requested via \$EXIT_ON_MISSING_PACKAGES."