projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2124a2f
)
Adjust grml-buildd for new logdir structure
author
Michael Prokop
<devnull@localhost>
Mon, 26 Nov 2007 18:58:51 +0000
(19:58 +0100)
committer
Michael Prokop
<devnull@localhost>
Mon, 26 Nov 2007 18:58:51 +0000
(19:58 +0100)
buildd/functions.sh
patch
|
blob
|
history
debian/changelog
patch
|
blob
|
history
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
patch
|
blob
|
history
etc/grml/grml-live.conf
patch
|
blob
|
history
diff --git
a/buildd/functions.sh
b/buildd/functions.sh
index
967c8f1
..
7b979bc
100755
(executable)
--- a/
buildd/functions.sh
+++ b/
buildd/functions.sh
@@
-45,7
+45,7
@@
else
[ -n "$GRML_LOGFILE" ] || GRML_LOGFILE=/var/log/grml-live.log
fi
[ -n "$GRML_LOGFILE" ] || GRML_LOGFILE=/var/log/grml-live.log
fi
-[ -n "$FAI_LOGFILES" ] || FAI_LOGFILES=/var/log/fai/
dirinstall/grml
+[ -n "$FAI_LOGFILES" ] || FAI_LOGFILES=/var/log/fai/
grml/last
echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
echo "my_hdr From: grml-live autobuild daemon <$FROM>" > $MUTT_HEADERS
@@
-72,7
+72,7
@@
grml_live_run() {
# create log archive:
create_logs() {
# create log archive:
create_logs() {
- ( cd / && tar zcf $ATTACHMENT
var/log/fai/dirinstall/grml
$GRML_LOGFILE 1>/dev/null )
+ ( cd / && tar zcf $ATTACHMENT
$FAI_LOGFILES
$GRML_LOGFILE 1>/dev/null )
}
# store information of ISO size:
}
# store information of ISO size:
diff --git
a/debian/changelog
b/debian/changelog
index
1f30d4c
..
d857b65
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-4,6
+4,7
@@
grml-live (0.0.11) unstable; urgency=low
* Add X.org packages to GRML_MEDIUM.
* Make sure /etc/X11/X is not a symlink to /bin/true. Check and fix
via /etc/grml/fai/config/scripts/GRMLBASE/32-xorg.
* Add X.org packages to GRML_MEDIUM.
* Make sure /etc/X11/X is not a symlink to /bin/true. Check and fix
via /etc/grml/fai/config/scripts/GRMLBASE/32-xorg.
+ * Adjust grml-buildd for new logdir structure.
-- Michael Prokop <mika@grml.org> Mon, 26 Nov 2007 15:07:54 +0100
-- Michael Prokop <mika@grml.org> Mon, 26 Nov 2007 15:07:54 +0100
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
b/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
index
a8b4a38
..
ec8e758
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
@@
-45,7
+45,7
@@
if ifclass RELEASE ; then
[ -x $target/etc/apt/grml/listbugs ] ; then
for severity in critical grave serious ; do
SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
[ -x $target/etc/apt/grml/listbugs ] ; then
for severity in critical grave serious ; do
SEVERITY=$severity $ROOTCMD /etc/apt/grml/listbugs > \
- /var/log/fai/
dirinstall/$HOSTNAME
/bugs.${severity} || true # make sure it does not fail
+ /var/log/fai/
$HOSTNAME/last
/bugs.${severity} || true # make sure it does not fail
done
fi
done
fi
diff --git
a/etc/grml/grml-live.conf
b/etc/grml/grml-live.conf
index
4555cb7
..
3420d0d
100644
(file)
--- a/
etc/grml/grml-live.conf
+++ b/
etc/grml/grml-live.conf
@@
-99,7
+99,7
@@
GRML_FAI_CONFIG=/etc/grml/fai
# FAI_ARGS=""
# Where do you want to store grml-live.log?
# FAI_ARGS=""
# Where do you want to store grml-live.log?
-# LOGDIR="/var/log/fai/
dirinstall/$HOSTNAME
"
+# LOGDIR="/var/log/fai/
$HOSTNAME/last
"
# Which architecture do you want to build?
# It defaults to output of 'dpkg --print-architecture'
# Which architecture do you want to build?
# It defaults to output of 'dpkg --print-architecture'