buildiso: tweak log_dir settings

prepare for relelease 0.11.0
This commit is contained in:
udeved 2016-02-26 18:22:27 +01:00
parent 4a9c9019a1
commit 585fa43795
6 changed files with 18 additions and 7 deletions

View file

@ -96,6 +96,7 @@
# limit=100 # limit=100
# the torrent tracker url # the torrent tracker url
# The tracker url can also contain comma separated urls
# tracker_url="" # tracker_url=""
# Piece size, 2^n # Piece size, 2^n

View file

@ -121,6 +121,12 @@
<listitem><para>Disable clean working directory step.</para></listitem> <listitem><para>Disable clean working directory step.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>-l</option></term>
<listitem><para>Log the build process.</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>-x</option></term> <term><option>-x</option></term>

View file

@ -104,6 +104,13 @@
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>log_dir=</varname></term>
<listitem><para>Log dir where buildiso log the build process. Default is "/var/log/manjaro-tools".
</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>build_mirror=</varname></term> <term><varname>build_mirror=</varname></term>
@ -313,7 +320,7 @@
<varlistentry> <varlistentry>
<term><varname>tracker_url=</varname></term> <term><varname>tracker_url=</varname></term>
<listitem><para>Default tracker announce for the torrent. <listitem><para>Default tracker announce for the torrent. The tracker url can also contain comma separated urls.
</para></listitem> </para></listitem>
</varlistentry> </varlistentry>

View file

@ -26,8 +26,8 @@ error_function() {
# $1: function # $1: function
run_log(){ run_log(){
local func="$1" local func="$1" name=$(gen_iso_fn)
local tmpfile=/tmp/$(gen_iso_fn).$func.log logfile=${profile_log_dir}/$func.log local tmpfile=/tmp/$name.$func.log logfile=${log_dir}/$name.$func.log
logpipe=$(mktemp -u "/tmp/logpipe.XXXXXXXX") logpipe=$(mktemp -u "/tmp/logpipe.XXXXXXXX")
mkfifo "$logpipe" mkfifo "$logpipe"
tee "$tmpfile" < "$logpipe" & tee "$tmpfile" < "$logpipe" &

View file

@ -618,10 +618,9 @@ load_profile(){
work_dir=${chroots_iso}/${profile}/${arch} work_dir=${chroots_iso}/${profile}/${arch}
iso_dir="${cache_dir_iso}/${edition}/${profile}/${dist_release}/${arch}" iso_dir="${cache_dir_iso}/${edition}/${profile}/${dist_release}/${arch}"
profile_log_dir="${log_dir_iso}/${profile}/${arch}"
prepare_dir "${iso_dir}" prepare_dir "${iso_dir}"
prepare_dir "${iso_dir}" prepare_dir "${log_dir}"
} }
prepare_profile(){ prepare_profile(){

View file

@ -171,8 +171,6 @@ init_buildiso(){
cache_dir_iso="${cache_dir}/iso" cache_dir_iso="${cache_dir}/iso"
log_dir_iso="${log_dir}/buildiso"
##### iso settings ##### ##### iso settings #####
[[ -z ${dist_release} ]] && dist_release=$(version_gen) [[ -z ${dist_release} ]] && dist_release=$(version_gen)