From 52ed8c247fe234bb3ed2e784d881a25e86928033 Mon Sep 17 00:00:00 2001 From: "Stephen A. Zarkos" Date: Tue, 25 Aug 2015 00:15:01 +0000 Subject: [PATCH] Simplify Azure udev patch. --- bootstrapvz/providers/azure/tasks/boot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/providers/azure/tasks/boot.py b/bootstrapvz/providers/azure/tasks/boot.py index ccd961a..892a842 100644 --- a/bootstrapvz/providers/azure/tasks/boot.py +++ b/bootstrapvz/providers/azure/tasks/boot.py @@ -15,9 +15,9 @@ class PatchUdev(Task): from bootstrapvz.common.tools import log_check_call from . import assets # c.f. http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/commit/?id=61e055638cea - diff_file = file.read(open(os.path.join(assets, 'udev.diff'), 'r')) - udev_dir = os.path.join(info.root, 'usr/share/initramfs-tools/scripts/init-top') - log_check_call(['patch', '--no-backup-if-mismatch', '-p6', '-d' + udev_dir], stdin=diff_file) + udev_file = os.path.join(info.root, 'usr/share/initramfs-tools/scripts/init-top/udev') + diff_file = os.path.join(assets, 'udev.diff') + log_check_call(['patch', '--no-backup-if-mismatch', udev_file, diff_file]) class ConfigureGrub(Task):