almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

Log the output of mkfs (#769928)

Browse Source
This commit is contained in:
Martin Gracik 2012-03-14 10:56:23 +01:00
parent 084e0e032b
commit 92a145dd18
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pylorax/imgutils.py
View File

@ -24,6 +24,7 @@ import os, tempfile
from os.path import join, dirname from os.path import join, dirname
from pylorax.sysutils import cpfile from pylorax.sysutils import cpfile
from subprocess import * from subprocess import *
import sys
import traceback import traceback
######## Functions for making container images (cpio, squashfs) ########## ######## Functions for making container images (cpio, squashfs) ##########
@ -267,8 +268,13 @@ def mkfsimage(fstype, rootdir, outfile, size=None, mkfsargs=[], mountargs="", gr
if not size: if not size:
size = estimate_size(rootdir, graft, fstype) size = estimate_size(rootdir, graft, fstype)
with LoopDev(outfile, size) as loopdev: with LoopDev(outfile, size) as loopdev:
check_call(["mkfs.%s" % fstype] + mkfsargs + [loopdev], try:
stdout=PIPE, stderr=PIPE) check_output(["mkfs.%s" % fstype] + mkfsargs + [loopdev])
except CalledProcessError as e:
logger.error("mkfs exited with a non-zero return code: %d" % e.returncode)
logger.error(e.output)
sys.exit(e.returncode)
with Mount(loopdev, mountargs) as mnt: with Mount(loopdev, mountargs) as mnt:
if rootdir: if rootdir:
copytree(rootdir, mnt, preserve) copytree(rootdir, mnt, preserve)