From 1c5a7aa9b0f0a64b14f37a90d705a8973ea8324b Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Mar 31 2015 08:33:38 +0000 Subject: - Patched anaconda/livepayload.py for live media (BZ #1100504) - Added a dep on older grubby (BZ #1153410) - Trimmed down packages list for livecd (space constraint) --- diff --git a/kickstarts/centos-7-live-gnome.cfg b/kickstarts/centos-7-live-gnome.cfg index 7add846..5b447bb 100644 --- a/kickstarts/centos-7-live-gnome.cfg +++ b/kickstarts/centos-7-live-gnome.cfg @@ -13,7 +13,9 @@ services --enabled=NetworkManager --disabled=network,sshd # Root password rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1 -repo --name=base --baseurl=http://buildlogs.centos.org/centos/7/os/x86_64-latest/ +# 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 %packages @base @@ -41,6 +43,7 @@ repo --name=base --baseurl=http://buildlogs.centos.org/centos/7/os/x86_64-latest anaconda system-config-keyboard firefox +patch # For UEFI/Secureboot support grub2 @@ -216,6 +219,42 @@ echo "localhost" > /etc/hostname EOF +# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504 +cat > /tmp/livepayload.patch < /etc/rc.d/init.d/livesys-late << EOF #!/bin/bash diff --git a/kickstarts/centos-7-live-kde.cfg b/kickstarts/centos-7-live-kde.cfg index becb4ab..8ca9645 100644 --- a/kickstarts/centos-7-live-kde.cfg +++ b/kickstarts/centos-7-live-kde.cfg @@ -13,7 +13,9 @@ services --enabled=NetworkManager --disabled=network,sshd # Root password rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1 -repo --name=base --baseurl=http://buildlogs.centos.org/centos/7/os/x86_64-latest/ +# 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 %packages @base @@ -42,6 +44,7 @@ repo --name=base --baseurl=http://buildlogs.centos.org/centos/7/os/x86_64-latest anaconda system-config-keyboard firefox +patch # For UEFI/Secureboot support grub2 @@ -217,6 +220,42 @@ echo "localhost" > /etc/hostname EOF +# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504 +cat > /tmp/livepayload.patch < /etc/rc.d/init.d/livesys-late << EOF #!/bin/bash diff --git a/kickstarts/centos-7-livecd.cfg b/kickstarts/centos-7-livecd.cfg index 65166d7..72b3eb1 100644 --- a/kickstarts/centos-7-livecd.cfg +++ b/kickstarts/centos-7-livecd.cfg @@ -13,8 +13,9 @@ services --enabled=NetworkManager --disabled=network,sshd # Root password rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1 -repo --name=base --baseurl=http://buildlogs.centos.org/centos/7/os/x86_64-latest/ - +# 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 %packages abattis-cantarell-fonts @@ -714,6 +715,7 @@ pangomm paratype-pt-sans-fonts parted passwd +patch pciutils pciutils-libs pcre @@ -766,7 +768,7 @@ poppler poppler-data poppler-glib popt -postfix +#postfix ppp procps-ng psacct @@ -1179,6 +1181,42 @@ echo "localhost" > /etc/hostname EOF +# Patching livepayload too https://bugzilla.redhat.com/show_bug.cgi?id=1100504 +cat > /tmp/livepayload.patch < /etc/rc.d/init.d/livesys-late << EOF #!/bin/bash