[master/f20/rhel7] Fix liveinst to work with livemedia-creator (#1009711)

Brian C. Lane bcl at redhat.com
Mon Oct 14 20:42:01 UTC 2013


From: "Brian C. Lane" <bcl at redhat.com>

livemedia-creator doesn't make the old osmin image and dracut now
creates a /dev/mapper/live-base pointing to the original device so that
we can mount it and rsync from there.

Resolves: rhbz#1009711

-- Fedora variation of this will reference bug 1018982 and dracut 034-7
---
 anaconda               | 2 +-
 anaconda.spec.in       | 2 +-
 data/liveinst/liveinst | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/anaconda b/anaconda
index 899e7d0..7e47a8f 100755
--- a/anaconda
+++ b/anaconda
@@ -948,7 +948,7 @@ if __name__ == "__main__":
             ksdata.method.method = "url"
             ksdata.method.url = anaconda.methodstr
         elif anaconda.methodstr.startswith("livecd"):
-            ksdata.method.method = "livecd"
+            ksdata.method.method = "harddrive"
             device = anaconda.methodstr.split(":", 1)[1]
             ksdata.method.partition = os.path.normpath(device)
         else:
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 63d205b..f196b2e 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -34,7 +34,7 @@ Source0: %{name}-%{version}.tar.bz2
 %define firewalldver 0.3.5-1
 %define pythonurlgrabberver 3.9.1-5
 %define utillinuxver 2.15.1
-%define dracutver 024-25
+%define dracutver 033-26
 %define isomd5sum 1.0.10
 %define fcoeutilsver 1.0.12-3.20100323git
 %define iscsiver 6.2.0.870-3
diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
index e320548..dce02e5 100755
--- a/data/liveinst/liveinst
+++ b/data/liveinst/liveinst
@@ -43,7 +43,9 @@ fi
 
 # Try to sort out where the live device is
 if [ -z "$LIVE_BLOCK" ]; then
-    if [ -b "/dev/mapper/live-osimg-min" ]; then
+    if [ -b "/dev/mapper/live-base" ]; then
+       LIVE_BLOCK="/dev/mapper/live-base"
+    elif [ -b "/dev/mapper/live-osimg-min" ]; then
        LIVE_BLOCK="/dev/mapper/live-osimg-min"
     fi
 fi
-- 
1.8.3.1



More information about the anaconda-patches mailing list