fixup live install (#853988, #854962)

liveinst:
  use /dev/mapper/live-osimg-min as the install source. This is the original
  filesystem before changes made by the live boot scripts.
  updates overwrite unconditionally

anaconda:
  handle livecd: method, set method to 'livecd' and partition to the path.

packaging:
  Move new-kernel-pkg creation into a helper method, _recreateInitrds
  Add a flag to prevent running new-kernel-pkg more than once

livepayload:
  mount the install source on INSTALL_TREE and rsync it to the ROOT_PATH
  Don't use verbose with rsync, results in huge program.log and slows
  down install. Error will be logged.
  Ignore rsync errors. It has problems with selinux xattrs. Log the
  return value, but continue.
  Call _recreateInitrds to create the initrd (#853988)

1 files changed, 2 insertions, 6 deletions

diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
index 6c001009b..f6bf686bb 100755
--- a/data/liveinst/liveinst
+++ b/data/liveinst/liveinst
@@ -43,12 +43,8 @@ fi
 
 # Try to sort out where the live device is
 if [ -z "$LIVE_BLOCK" ]; then
-    if [ -b "/run/initramfs/live-baseloop" ]; then
-       LIVE_BLOCK=`readlink -f /run/initramfs/live-baseloop`
-    elif [ -b "/dev/mapper/live-osimg-min" ]; then
+    if [ -b "/dev/mapper/live-osimg-min" ]; then
        LIVE_BLOCK="/dev/mapper/live-osimg-min"
-    elif [ -b "/dev/live-osimg" ]; then
-       LIVE_BLOCK="/dev/live-osimg"
     fi
 fi
 
@@ -123,7 +119,7 @@ if [ ! -z "$UPDATES" ]; then
     # We officially support two updates.img formats:  a filesystem image, and
     # a compressed cpio blob.
     if [ ! -z "$(file /tmp/updates.img | grep 'gzip compressed data')" ]; then
-        ( cd / ; gzip -dc /tmp/updates.img | cpio -id )
+        ( cd / ; gzip -dc /tmp/updates.img | cpio -idu )
     else
         mkdir /tmp/updates.disk
         mount -t auto /tmp/updates.img /tmp/updates.disk