---
anaconda.spec.in | 2 +-
scripts/analog | 5 ++++-
scripts/mk-images | 6 ++++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 3bcce90..98b4e91 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define intltoolver 0.31.2-3
%define libnlver 1.0
%define libselinuxver 1.6
-%define pykickstartver 1.77
+%define pykickstartver 1.76
%define rpmpythonver 4.2-0.61
%define slangver 2.0.6-2
%define yumver 2.9.2
diff --git a/scripts/analog b/scripts/analog
index 1041372..ae3ca2d 100755
--- a/scripts/analog
+++ b/scripts/analog
@@ -60,7 +60,7 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
#### RULES ####
-$template anaconda_tty4, "%%timestamp:8:$:date-rfc3164%%,%%timestamp:1:3:date-subseconds%% %%syslogseverity-text:::uppercase%% %%programname%%:%%msg%%\\n"
+$template anaconda_justmsg, "%%msg%%\\n"
$template anaconda_debug, "%%rawmsg%%\\n"
$template anaconda_syslog, "%%timestamp:8:$:date-rfc3164%%,%%timestamp:1:3:date-subseconds%% %%syslogseverity-text:::uppercase%% %%programname%%:%%msg%%\\n"
@@ -68,6 +68,7 @@ $template path_syslog, "%(directory)s/%(subdirectory)s/syslog
$template path_anaconda, "%(directory)s/%(subdirectory)s/anaconda.log"
$template path_program, "%(directory)s/%(subdirectory)s/program.log"
$template path_storage, "%(directory)s/%(subdirectory)s/storage.log"
+$template path_xserver, "%(directory)s/%(subdirectory)s/X.log"
$template path_sysimage, "%(directory)s/%(subdirectory)s/install.log.syslog"
*.* %(directory)s/debug_all.log;anaconda_debug
@@ -80,6 +81,7 @@ authpriv.* ?path_syslog;anaconda_syslo
:programname, contains, "anaconda" ?path_anaconda;anaconda_syslog
:programname, contains, "program" ?path_program;anaconda_syslog
:programname, contains, "storage" ?path_storage;anaconda_syslog
+:programname, contains, "xserver" ?path_xserver;anaconda_justmsg
:hostname, contains, "sysimage" ?path_sysimage;anaconda_syslog
# discard those that we logged
@@ -88,6 +90,7 @@ authpriv.* ?path_syslog;anaconda_syslo
:programname, contains, "anaconda" ~
:programname, contains, "program" ~
:programname, contains, "storage" ~
+:programname, contains, "xserver" ~
:hostname, contains, "sysimage" ~
kern.* ~
daemon.* ~
diff --git a/scripts/mk-images b/scripts/mk-images
index 43989bc..7eb1b68 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -804,6 +804,12 @@ makeinitrd() {
$ModLoad imuxsock.so # provides support for local system logging
$ModLoad imklog.so # provides kernel logging support
+$ModLoad imfile
+$InputFileName /tmp/X.log
+$InputFileTag xserver:
+$InputFileStateFile xserver-statefile
+$InputRunFileMonitor
+
#### GLOBAL DIRECTIVES ####
# Use default timestamp format
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
--
1.7.1.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
