Sandro Bonazzola has uploaded a new change for review. Change subject: centos: update to 7.1 kickstart ......................................................................
centos: update to 7.1 kickstart 7.0 kickstart failed with 7.1 rpms. Updated the kickstart for matching 7.1 one. Change-Id: I88f6fe8d28d88aa9c53c3cb318cfb1e7a73fc44d Signed-off-by: Sandro Bonazzola <[email protected]> --- M centos-7/kickstart/centos-7-livecd.cfg 1 file changed, 47 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/76/39476/1 diff --git a/centos-7/kickstart/centos-7-livecd.cfg b/centos-7/kickstart/centos-7-livecd.cfg index ac578d8..482e485 100644 --- a/centos-7/kickstart/centos-7-livecd.cfg +++ b/centos-7/kickstart/centos-7-livecd.cfg @@ -1,4 +1,4 @@ -# based on https://git.centos.org/blob/sig-core!livemedia.git/4b13a251fdb057f4cd095629a0d5c1106959ba43/kickstarts!centos-7-livecd.cfg +# based on https://git.centos.org/raw/sig-core!livemedia.git/44dc01ca0f1f7c31b77cf9707ed2b74005670d1f/kickstarts!centos-7-livecd.cfg #{ ovirt: prefer US over GB #lang en_GB.UTF-8 lang en_US.UTF-8 @@ -30,9 +30,11 @@ #} #{ ovirt: -#repo --name=base --baseurl=http://buildlogs.centos.org/centos/7/os/x86_64-latest/ -repo --name=base --baseurl=http://mirror.centos.org/centos/7/os/x86_64/ -repo --name=updates --baseurl=http://mirror.centos.org/centos/7/updates/x86_64/ +# 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=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/ repo --name=epel --baseurl=http://download.fedoraproject.org/pub/epel/7/x86_64/ #} @@ -170,9 +172,6 @@ enchant eog ethtool -evince -evince-libs -evince-nautilus evolution-data-server exempi exiv2-libs @@ -454,9 +453,6 @@ liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -libertas-sd8686-firmware -libertas-sd8787-firmware -libertas-usb8388-firmware libestr libevent libexif @@ -693,7 +689,7 @@ nettle net-tools NetworkManager -NetworkManager-config-server +#NetworkManager-config-server NetworkManager-glib NetworkManager-libreswan NetworkManager-tui @@ -741,6 +737,7 @@ paratype-pt-sans-fonts parted passwd +patch pciutils pciutils-libs pcre @@ -793,7 +790,7 @@ poppler-data poppler-glib popt -postfix +#postfix ppp procps-ng psacct @@ -1025,7 +1022,6 @@ yum yum-langpacks yum-metadata-parser -yum-rhn-plugin yum-utils zenity zip @@ -1207,6 +1203,42 @@ 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 #!/bin/bash @@ -1310,7 +1342,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 @@ -1323,7 +1355,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/39476 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88f6fe8d28d88aa9c53c3cb318cfb1e7a73fc44d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
