[Pkg-privacy-commits] [tails-installer] 14/35: Get persistent overlays working with F18 (#908120)

[anonym]

This is an automated email from the git hooks/post-receive script.

anonym-tails-guest pushed a commit to annotated tag 3.12.0
in repository tails-installer.

commit 80180410d76c4191a4451b029eeee300f4f56886
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Mar 1 13:52:56 2013 -0500

    Get persistent overlays working with F18 (#908120)
---
 liveusb/creator.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 7f34ab6..55ce830 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -280,12 +280,21 @@ class LiveUSBCreator(object):
                               line)
             if "isolinux" in line:
                 line = re.sub("isolinux", "syslinux", line)
-            if self.overlay and "liveimg" in line:
-                line = line.replace("liveimg", "liveimg overlay=" + usblabel)
-                line = line.replace(" ro ", " rw ")
-            if self.opts.kernel_args:
-                line = line.replace("liveimg", "liveimg %s" %
-                                    ' '.join(self.opts.kernel_args.split(',')))
+            if "liveimg" in line:
+                if self.overlay:
+                    line = line.replace("liveimg", "liveimg overlay=" + usblabel)
+                    line = line.replace(" ro ", " rw ")
+                if self.opts.kernel_args:
+                    line = line.replace("liveimg", "liveimg %s" %
+                                        ' '.join(self.opts.kernel_args.split(',')))
+            elif "rd.live.image" in line:
+                if self.overlay:
+                    line = line.replace("rd.live.image", "rd.live.image " +
+                                        "rd.live.overlay=" + usblabel)
+                    line = line.replace(" ro ", " rw ")
+                if self.opts.kernel_args:
+                    line = line.replace("rd.live.image", "rd.live.image %s" %
+                                        ' '.join(self.opts.kernel_args.split(',')))
             outfile.write(line)
         infile.close()
         outfile.close()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git