Sandro Bonazzola has uploaded a new change for review.
Change subject: centos: 7.0 has been moved to vault
......................................................................
centos: 7.0 has been moved to vault
Fixing reference for grubby rpm after 7.0
being moved to the CentOS Vault.
Change-Id: Iba758e7d4b310329ec54e3bfe1a1da2af2932171
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M centos-7/kickstart/centos-7-livecd.cfg
1 file changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/69/39669/1
diff --git a/centos-7/kickstart/centos-7-livecd.cfg
b/centos-7/kickstart/centos-7-livecd.cfg
index 482e485..4a2445a 100644
--- a/centos-7/kickstart/centos-7-livecd.cfg
+++ b/centos-7/kickstart/centos-7-livecd.cfg
@@ -32,7 +32,8 @@
#{ ovirt:
# 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/centos/7.1.1503/os/x86_64/
--excludepkgs=grubby
-repo --name=grubby
--baseurl=http://mirror.centos.org/centos//7.0.1406/os/x86_64/
--includepkgs=grubby
+#repo --name=grubby
--baseurl=http://mirror.centos.org/centos//7.0.1406/os/x86_64/
--includepkgs=grubby
+repo --name=grubby --baseurl=http://vault.centos.org/7.0.1406/os/x86_64/
--includepkgs=grubby
repo --name=base --baseurl=http://mirror.centos.org/centos/7/os/x86_64/
--excludepkgs=grubby
repo --name=updates
--baseurl=http://mirror.centos.org/centos/7/updates/x86_64/ --excludepkgs=grubby
repo --name=extras --baseurl=http://mirror.centos.org/centos/7/extras/x86_64/
@@ -1205,12 +1206,12 @@
# 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.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)
@@ -1222,9 +1223,9 @@
""" 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)
@@ -1237,7 +1238,7 @@
EOF
-patch -p0
/usr/lib64/python2.7/site-packages/pyanaconda/packaging/livepayload.py
/tmp/livepayload.patch
+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
@@ -1342,7 +1343,7 @@
# Show the system-config-keyboard tool on the desktop
mkdir /home/liveuser/Desktop -p >/dev/null
cat /usr/share/applications/system-config-keyboard.desktop | sed
'/NotShowIn/d' |sed 's/Terminal=false/Terminal=true/' >
/home/liveuser/Desktop/system-config-keyboard.desktop
-cat /usr/share/applications/liveinst.desktop | sed '/NoDisplay/d' >
/home/liveuser/Desktop/liveinst.desktop
+cat /usr/share/applications/liveinst.desktop | sed '/NoDisplay/d' >
/home/liveuser/Desktop/liveinst.desktop
chmod +x /home/liveuser/Desktop/*.desktop
chown -R liveuser:liveuser /home/liveuser
@@ -1355,7 +1356,7 @@
# make the installer show up
if [ -f /usr/share/applications/liveinst.desktop ]; then
# Show harddisk install in shell dash
- sed -i -e 's/NoDisplay=true/NoDisplay=false/'
/usr/share/applications/liveinst.desktop
+ sed -i -e 's/NoDisplay=true/NoDisplay=false/'
/usr/share/applications/liveinst.desktop
# need to move it to anaconda.desktop to make shell happy
#cp /usr/share/applications/liveinst.desktop
/usr/share/applications/anaconda.desktop
fi
--
To view, visit https://gerrit.ovirt.org/39669
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba758e7d4b310329ec54e3bfe1a1da2af2932171
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-live
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
