diff options
| -rw-r--r-- | data/post-scripts/95-copy-logs.ks | 13 | ||||
| -rw-r--r-- | data/post-scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | pyanaconda/dispatch.py | 2 | ||||
| -rw-r--r-- | pyanaconda/installclass.py | 1 | ||||
| -rw-r--r-- | pyanaconda/packages.py | 19 | ||||
| -rw-r--r-- | pyanaconda/upgrade.py | 1 |
6 files changed, 14 insertions, 24 deletions
diff --git a/data/post-scripts/95-copy-logs.ks b/data/post-scripts/95-copy-logs.ks new file mode 100644 index 000000000..013fe2ed7 --- /dev/null +++ b/data/post-scripts/95-copy-logs.ks @@ -0,0 +1,13 @@ +%post --nochroot + +mkdir -p /mnt/sysimage/var/log/anaconda +[ -e /tmp/anaconda.log ] && cp /tmp/anaconda.log /mnt/sysimage/var/log/anaconda/anaconda.log +[ -e /tmp/syslog ] && cp /tmp/syslog /mnt/sysimage/var/log/anaconda/syslog +[ -e /tmp/X.log ] && cp /tmp/X.log /mnt/sysimage/var/log/anaconda.anaconda.xlog +[ -e /tmp/program.log ] && cp /tmp/program.log /mnt/sysimage/var/log/anaconda/anaconda.program.log +[ -e /tmp/storage.log ] && cp /tmp/storage.log /mnt/sysimage/var/log/anaconda/anaconda.storage.log +[ -e /tmp/ifcfg.log ] && cp /tmp/ifcfg.log /mnt/sysimage/var/log/anaconda/anaconda.ifcfg.log +[ -e /tmp/yum.log ] && cp /tmp/yum.log /mnt/sysimage/var/log/anaconda/anaconda.yum.log +chmod 0600 /mnt/sysimage/var/log/anaconda/* + +%end diff --git a/data/post-scripts/Makefile.am b/data/post-scripts/Makefile.am index f2687cbb7..a57f85be5 100644 --- a/data/post-scripts/Makefile.am +++ b/data/post-scripts/Makefile.am @@ -18,5 +18,5 @@ # Author: Chris Lumens <clumens@redhat.com> postscriptsdir = $(datadir)/$(PACKAGE_NAME)/post-scripts -dist_postscripts_DATA = 90-copy-screenshots.ks +dist_postscripts_DATA = 90-copy-screenshots.ks 95-copy-logs.ks MAINTAINERCLEAFILES = Makefile.in diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py index 85e66b044..9001a0810 100644 --- a/pyanaconda/dispatch.py +++ b/pyanaconda/dispatch.py @@ -27,7 +27,6 @@ import indexed_dict from constants import * from packages import writeKSConfiguration, turnOnFilesystems from packages import doPostAction -from packages import copyAnacondaLogs from packages import firstbootConfiguration from packages import betaNagScreen from packages import setupTimezone @@ -293,7 +292,6 @@ class Dispatcher(object): self.add_step("reipl", doReIPL) self.add_step("writeksconfig", writeKSConfiguration) self.add_step("setfilecon", setFileCons) - self.add_step("copylogs", copyAnacondaLogs) self.add_step("methodcomplete", doMethodComplete) self.add_step("postscripts", runPostScripts) self.add_step("dopostaction", doPostAction) diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 0d784f291..e75eeab7b 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -118,7 +118,6 @@ class BaseInstallClass(object): "postscripts", "writeksconfig", "methodcomplete", - "copylogs", "setfilecon", "complete" ) diff --git a/pyanaconda/packages.py b/pyanaconda/packages.py index 953b69c0b..9a145b971 100644 --- a/pyanaconda/packages.py +++ b/pyanaconda/packages.py @@ -66,25 +66,6 @@ def writeKSConfiguration(anaconda): anaconda.writeKS(fn) -def copyAnacondaLogs(anaconda): - log.info("Copying anaconda logs") - if not os.path.isdir (ROOT_PATH + '/var/log/anaconda'): - os.mkdir(ROOT_PATH + '/var/log/anaconda') - - for (fn, dest) in (("/tmp/anaconda.log", "anaconda.log"), - ("/tmp/syslog", "anaconda.syslog"), - ("/tmp/X.log", "anaconda.xlog"), - ("/tmp/program.log", "anaconda.program.log"), - ("/tmp/storage.log", "anaconda.storage.log"), - ("/tmp/ifcfg.log", "anaconda.ifcfg.log"), - ("/tmp/yum.log", "anaconda.yum.log")): - if os.access(fn, os.R_OK): - try: - shutil.copyfile(fn, "%s/var/log/anaconda/%s" %(ROOT_PATH, dest)) - os.chmod("%s/var/log/anaconda/%s" %(ROOT_PATH, dest), 0600) - except: - pass - def turnOnFilesystems(anaconda): if anaconda.dir == DISPATCH_BACK: rc = anaconda.intf.messageWindow(_("Warning"), diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py index d5dd7a4ca..7784228e8 100644 --- a/pyanaconda/upgrade.py +++ b/pyanaconda/upgrade.py @@ -290,7 +290,6 @@ def setSteps(anaconda): "dopostaction", "methodcomplete", "postscripts", - "copylogs", "complete" ) |