Attachment 896030 Details for Bug 1098303 – anaconda: detect /var better

[patch] anaconda: detect /var better

0001-rpmostreepayload-Don-t-clobber-var-mount-if-it-exist.patch (text/plain), 1.46 KB, created by Colin Walters on 2014-05-15 17:24:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2014-05-15 17:24:28 UTC

Size: 1.46 KB

patch

obsolete

>From dcfd60f2d20421a1e85d4efac9a4df621664bede Mon Sep 17 00:00:00 2001
>From: Colin Walters <walters@verbum.org>
>Date: Thu, 15 May 2014 12:35:33 -0400
>Subject: [PATCH] rpmostreepayload: Don't clobber /var mount if it exists
>
>This should work in the Anaconda side, but right now OSTree doesn't
>quite support making /var a mount point cleanly.  It'd be good to have
>Anaconda's code ready for that though.
>---
> pyanaconda/packaging/rpmostreepayload.py | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/pyanaconda/packaging/rpmostreepayload.py b/pyanaconda/packaging/rpmostreepayload.py
>index b1b9eb9..e6456f2 100644
>--- a/pyanaconda/packaging/rpmostreepayload.py
>+++ b/pyanaconda/packaging/rpmostreepayload.py
>@@ -173,10 +173,14 @@ class RPMOSTreePayload(ArchivePayload):
>         # that %post script work inside the target.
>         binds = [(iutil.getTargetPhysicalRoot(),
>                   iutil.getSysroot() + '/sysroot'),
>-                 (varroot,
>-                  iutil.getSysroot() + '/var'),
>                  (iutil.getSysroot() + '/usr', None)]
> 
>+        # We want to allow /var to be a target mount point
>+        varmnt = storage.mountpoints.get('/var')
>+        if varmnt is None:
>+            binds.append((varroot,
>+                          iutil.getSysroot() + '/var'))
>+
>         for (src, dest) in binds:
>             self._safeExecWithRedirect("mount",
>                                        ["--bind", src, dest if dest else src])
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1098303: 896030