Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Have qubesd open the block device #462

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Have qubesd open the block device #462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions qubes/backup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,28 +638,36 @@ async def _wrap_and_send_files(self, files_to_backup, output_queue):
os.path.basename(path)
])
file_stat = os.stat(path)
if stat.S_ISBLK(file_stat.st_mode) or \
file_info.name != os.path.basename(path):
# tar doesn't handle content of block device, use our
# writer
# also use our tar writer when renaming file
assert not stat.S_ISDIR(file_stat.st_mode), \
"Renaming directories not supported"
tar_cmdline = ['python3', '-m', 'qubes.tarwriter',
'--override-name=%s' % (
os.path.join(file_info.subdir, os.path.basename(
file_info.name))),
path]
if self.compressed:
tar_cmdline.insert(-2,
"--use-compress-program=%s" % self.compression_filter)

self.log.debug(" ".join(tar_cmdline))

# Pipe: tar-sparse | scrypt | tar | backup_target
# TODO: log handle stderr
tar_sparse = await asyncio.create_subprocess_exec(
*tar_cmdline, stdout=subprocess.PIPE)
fd_to_close = None
subprocess_kwargs = {'stdout': subprocess.PIPE}
try:
if stat.S_ISBLK(file_stat.st_mode) or \
file_info.name != os.path.basename(path):
# tar doesn't handle content of block device, use our
# writer
# also use our tar writer when renaming file
assert not stat.S_ISDIR(file_stat.st_mode), \
"Renaming directories not supported"
# pylint: disable=line-too-long
fd_to_close = os.open(path, os.O_RDONLY | os.O_NOCTTY | os.O_CLOEXEC)
subprocess_kwargs['stdin'] = fd_to_close
tar_cmdline = ['python3', '-m', 'qubes.tarwriter',
'--override-name=%s' % (
os.path.join(file_info.subdir, os.path.basename(
file_info.name))),
'/proc/self/fd/0']
if self.compressed:
tar_cmdline.insert(-2,
"--use-compress-program=" + self.compression_filter)

# Pipe: tar-sparse | scrypt | tar | backup_target
# TODO: log handle stderr
tar_sparse = await asyncio.create_subprocess_exec(
*tar_cmdline, **subprocess_kwargs)
finally:
if fd_to_close is not None:
os.close(fd_to_close)
del fd_to_close, subprocess_kwargs

try:
await self._split_and_send(
Expand Down