From 78706a9bead97748ada4a99b0c7079522c0d7883 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Dec 10 2015 10:09:09 +0000
Subject: - Fixed the virbr0/libvirt issue in live images

- Removed the previous livepayload patch (not needed anymore)

---

diff --git a/kickstarts/centos-7-live-gnome-i386.cfg b/kickstarts/centos-7-live-gnome-i386.cfg
index f86ab1d..bff52e2 100644
--- a/kickstarts/centos-7-live-gnome-i386.cfg
+++ b/kickstarts/centos-7-live-gnome-i386.cfg
@@ -13,10 +13,7 @@ services --enabled=NetworkManager --disabled=network,sshd
 # Root password
 rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1
 
-# Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
-repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ --excludepkgs=grubby
-repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/ --includepkgs=grubby --excludepkgs=*.x86_64
-repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ --excludepkgs=grubby
+repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ 
  
 %packages
 @base
@@ -38,6 +35,8 @@ repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ -
 @office-suite
 @remote-desktop-clients
 @gnome-apps
+-libvirt
+-gnome-boxes
 
 
 #Live install tools
@@ -234,41 +233,7 @@ X-GNOME-Autostart-Phase=Initialization
 
 EOF
 
-# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
-cat > /tmp/livepayload.patch <<EOF
---- /usr/lib/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig	
-+++ /usr/lib/python2.7/site-packages/pyanaconda/packaging/livepayload.py
-@@ -152,6 +152,13 @@
-             self.pct = 100
-         threadMgr.wait(THREAD_LIVE_PROGRESS)
- 
-+        # Live needs to create the rescue image before bootloader is written
-+        for kernel in self.kernelVersionList:
-+            log.info("Generating rescue image for %s", kernel)
-+            iutil.execInSysroot("new-kernel-pkg",
-+                                ["--rpmposttrans", kernel])
-+
-+
-     def postInstall(self):
-         """ Perform post-installation tasks. """
-         progressQ.send_message(_("Performing post-installation setup tasks"))
-@@ -159,12 +166,6 @@
- 
-         super(LiveImagePayload, self).postInstall()
- 
--        # Live needs to create the rescue image before bootloader is written
--        for kernel in self.kernelVersionList:
--            log.info("Generating rescue image for %s", kernel)
--            iutil.execInSysroot("new-kernel-pkg",
--                                ["--rpmposttrans", kernel])
--
-         # Make sure the new system has a machine-id, it won't boot without it
-         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
-             iutil.execInSysroot("systemd-machine-id-setup", [])
-
-EOF
 
-patch -p0 /usr/lib/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch 
 
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF
diff --git a/kickstarts/centos-7-live-gnome.cfg b/kickstarts/centos-7-live-gnome.cfg
index dc87ddd..2e5b062 100644
--- a/kickstarts/centos-7-live-gnome.cfg
+++ b/kickstarts/centos-7-live-gnome.cfg
@@ -35,6 +35,8 @@ repo --name=base --baseurl=http://mirror.centos.org/centos/7/os/x86_64/
 @office-suite
 @remote-desktop-clients
 @gnome-apps
+-libvirt
+-gnome-boxes
 
 
 #Live install tools
@@ -218,41 +220,7 @@ echo "localhost" > /etc/hostname
 
 EOF
 
-# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
-cat > /tmp/livepayload.patch <<EOF
---- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig	
-+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
-@@ -152,6 +152,13 @@
-             self.pct = 100
-         threadMgr.wait(THREAD_LIVE_PROGRESS)
- 
-+        # Live needs to create the rescue image before bootloader is written
-+        for kernel in self.kernelVersionList:
-+            log.info("Generating rescue image for %s", kernel)
-+            iutil.execInSysroot("new-kernel-pkg",
-+                                ["--rpmposttrans", kernel])
-+
-+
-     def postInstall(self):
-         """ Perform post-installation tasks. """
-         progressQ.send_message(_("Performing post-installation setup tasks"))
-@@ -159,12 +166,6 @@
- 
-         super(LiveImagePayload, self).postInstall()
- 
--        # Live needs to create the rescue image before bootloader is written
--        for kernel in self.kernelVersionList:
--            log.info("Generating rescue image for %s", kernel)
--            iutil.execInSysroot("new-kernel-pkg",
--                                ["--rpmposttrans", kernel])
--
-         # Make sure the new system has a machine-id, it won't boot without it
-         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
-             iutil.execInSysroot("systemd-machine-id-setup", [])
 
-EOF
-
-patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch 
 
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF
diff --git a/kickstarts/centos-7-live-kde-i386.cfg b/kickstarts/centos-7-live-kde-i386.cfg
index f076ed3..6269c3b 100644
--- a/kickstarts/centos-7-live-kde-i386.cfg
+++ b/kickstarts/centos-7-live-kde-i386.cfg
@@ -13,10 +13,8 @@ services --enabled=NetworkManager --disabled=network,sshd
 # Root password
 rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1
 
-# Workaround for the grubby issue on live media (see https://bugzilla.redhat.com/show_bug.cgi?id=1153410)
-repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ --excludepkgs=grubby
-repo --name=grubby --baseurl=http://dev.centos.org/c7.00.02/ --includepkgs=grubby --excludepkgs=*.x86_64
-repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ --excludepkgs=grubby
+
+repo --name=base --baseurl=http://mirror.centos.org/altarch/7/os/i386/ 
 
 %packages
 @base
@@ -39,6 +37,8 @@ repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/i386/ -
 @remote-desktop-clients
 @kde-apps
 @kde-media
+-libvirt
+-gnome-boxes
 
 
 #Live install tools
@@ -236,41 +236,7 @@ X-GNOME-Autostart-Phase=Initialization
 EOF
 
 
-# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
-cat > /tmp/livepayload.patch <<EOF
---- /usr/lib/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig	
-+++ /usr/lib/python2.7/site-packages/pyanaconda/packaging/livepayload.py
-@@ -152,6 +152,13 @@
-             self.pct = 100
-         threadMgr.wait(THREAD_LIVE_PROGRESS)
- 
-+        # Live needs to create the rescue image before bootloader is written
-+        for kernel in self.kernelVersionList:
-+            log.info("Generating rescue image for %s", kernel)
-+            iutil.execInSysroot("new-kernel-pkg",
-+                                ["--rpmposttrans", kernel])
-+
-+
-     def postInstall(self):
-         """ Perform post-installation tasks. """
-         progressQ.send_message(_("Performing post-installation setup tasks"))
-@@ -159,12 +166,6 @@
- 
-         super(LiveImagePayload, self).postInstall()
- 
--        # Live needs to create the rescue image before bootloader is written
--        for kernel in self.kernelVersionList:
--            log.info("Generating rescue image for %s", kernel)
--            iutil.execInSysroot("new-kernel-pkg",
--                                ["--rpmposttrans", kernel])
--
-         # Make sure the new system has a machine-id, it won't boot without it
-         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
-             iutil.execInSysroot("systemd-machine-id-setup", [])
-
-EOF
 
-patch -p0 /usr/lib/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch 
 
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF
diff --git a/kickstarts/centos-7-live-kde.cfg b/kickstarts/centos-7-live-kde.cfg
index 23f321b..a86f5f8 100644
--- a/kickstarts/centos-7-live-kde.cfg
+++ b/kickstarts/centos-7-live-kde.cfg
@@ -37,6 +37,8 @@ repo --name=base --baseurl=http://mirror.centos.org/centos/7/os/x86_64/
 @kde-apps
 @kde-media
 kde-l10n-*
+-libvirt
+-gnome-boxes
 
 
 #Live install tools
@@ -220,41 +222,7 @@ echo "localhost" > /etc/hostname
 
 EOF
 
-# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504
-cat > /tmp/livepayload.patch <<EOF
---- /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py.orig	
-+++ /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
-@@ -152,6 +152,13 @@
-             self.pct = 100
-         threadMgr.wait(THREAD_LIVE_PROGRESS)
- 
-+        # Live needs to create the rescue image before bootloader is written
-+        for kernel in self.kernelVersionList:
-+            log.info("Generating rescue image for %s", kernel)
-+            iutil.execInSysroot("new-kernel-pkg",
-+                                ["--rpmposttrans", kernel])
-+
-+
-     def postInstall(self):
-         """ Perform post-installation tasks. """
-         progressQ.send_message(_("Performing post-installation setup tasks"))
-@@ -159,12 +166,6 @@
- 
-         super(LiveImagePayload, self).postInstall()
- 
--        # Live needs to create the rescue image before bootloader is written
--        for kernel in self.kernelVersionList:
--            log.info("Generating rescue image for %s", kernel)
--            iutil.execInSysroot("new-kernel-pkg",
--                                ["--rpmposttrans", kernel])
--
-         # Make sure the new system has a machine-id, it won't boot without it
-         if not os.path.exists(iutil.getSysroot()+"/etc/machine-id"):
-             iutil.execInSysroot("systemd-machine-id-setup", [])
 
-EOF
-
-patch -p0 /usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py /tmp/livepayload.patch 
 
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF