|
 |
fbcaed |
From 0de3ad9f51a21556adebf6cc1f6929091a4d8dae Mon Sep 17 00:00:00 2001
|
|
|
fbcaed |
From: Colin Walters <walters@verbum.org>
|
|
|
fbcaed |
Date: Mon, 26 May 2014 15:57:13 -0400
|
|
|
fbcaed |
Subject: [PATCH 17/20] rpmostreepayload: Don't recreateInitrds for this
|
|
|
fbcaed |
payload
|
|
|
fbcaed |
|
|
|
fbcaed |
The OSTree replication design has the initramfs generated on a compose
|
|
|
fbcaed |
server. Avoid regenerating them locally.
|
|
|
fbcaed |
|
|
|
fbcaed |
Resolves: rhbz#1113535
|
|
|
fbcaed |
Port of rpmostreepayload patches from master
|
|
|
fbcaed |
commit 528b6215fff48337b45edfa2dbc548c54437b42b
|
|
|
fbcaed |
---
|
|
|
fbcaed |
pyanaconda/packaging/rpmostreepayload.py | 6 ++++++
|
|
|
fbcaed |
1 file changed, 6 insertions(+)
|
|
|
fbcaed |
|
|
|
fbcaed |
diff --git a/pyanaconda/packaging/rpmostreepayload.py b/pyanaconda/packaging/rpmostreepayload.py
|
|
|
fbcaed |
index 0210017..b425ec4 100644
|
|
|
fbcaed |
--- a/pyanaconda/packaging/rpmostreepayload.py
|
|
|
fbcaed |
+++ b/pyanaconda/packaging/rpmostreepayload.py
|
|
|
fbcaed |
@@ -197,6 +197,12 @@ class RPMOSTreePayload(ArchivePayload):
|
|
|
fbcaed |
["--create", "--boot", "--root=" + iutil.getSysroot(),
|
|
|
fbcaed |
"--prefix=/var/" + varsubdir])
|
|
|
fbcaed |
|
|
|
fbcaed |
+ def recreateInitrds(self, force=False):
|
|
|
fbcaed |
+ # For rpmostree payloads, we're replicating an initramfs from
|
|
|
fbcaed |
+ # a compose server, and should never be regenerating them
|
|
|
fbcaed |
+ # per-machine.
|
|
|
fbcaed |
+ pass
|
|
|
fbcaed |
+
|
|
|
fbcaed |
def postInstall(self):
|
|
|
fbcaed |
super(RPMOSTreePayload, self).postInstall()
|
|
|
fbcaed |
|
|
|
fbcaed |
--
|
|
|
fbcaed |
1.9.3
|
|
|
fbcaed |
|