Sandro Bonazzola has uploaded a new change for review. Change subject: Add CentOS 7 build ......................................................................
Add CentOS 7 build Moved centos to centos-6 and added centos-7 introducing CentOS 7 build with TintCore 6. Bug-Url: https://bugzilla.redhat.com/1189842 Change-Id: I8a2d90850cf7e4e00511fb506ebce49d5f61564b Signed-off-by: Sandro Bonazzola <[email protected]> --- R centos-6/.gitignore R centos-6/Makefile R centos-6/kickstart/ovirt-live-base.ks R centos-6/kickstart/ovirt-live-gnome.ks R centos-6/kickstart/ovirt-live-ovirt-custom.ks.in R centos-6/oVirtLiveFiles/root/etc/gdm/custom.conf R centos-6/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf R centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 R centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 R centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt R centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 R centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt R centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt R centos-6/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg R centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer R centos-6/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop R centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override R centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override R centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override R centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override R centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py R centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py R centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py C centos-7/.gitignore A centos-7/Makefile A centos-7/kickstart/centos-7-livecd.cfg A centos-7/kickstart/ovirt-live-ovirt-custom.ks.in C centos-7/oVirtLiveFiles/root/etc/gdm/custom.conf C centos-7/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf C centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 C centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 C centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt C centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 C centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt C centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt C centos-7/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg C centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer C centos-7/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop C centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override C centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override C centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override C centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override C centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py C centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py C centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py 61 files changed, 1,538 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/64/37564/1 diff --git a/centos/.gitignore b/centos-6/.gitignore similarity index 100% rename from centos/.gitignore rename to centos-6/.gitignore diff --git a/centos/Makefile b/centos-6/Makefile similarity index 100% rename from centos/Makefile rename to centos-6/Makefile diff --git a/centos/kickstart/ovirt-live-base.ks b/centos-6/kickstart/ovirt-live-base.ks similarity index 100% rename from centos/kickstart/ovirt-live-base.ks rename to centos-6/kickstart/ovirt-live-base.ks diff --git a/centos/kickstart/ovirt-live-gnome.ks b/centos-6/kickstart/ovirt-live-gnome.ks similarity index 100% rename from centos/kickstart/ovirt-live-gnome.ks rename to centos-6/kickstart/ovirt-live-gnome.ks diff --git a/centos/kickstart/ovirt-live-ovirt-custom.ks.in b/centos-6/kickstart/ovirt-live-ovirt-custom.ks.in similarity index 100% rename from centos/kickstart/ovirt-live-ovirt-custom.ks.in rename to centos-6/kickstart/ovirt-live-ovirt-custom.ks.in diff --git a/centos/oVirtLiveFiles/root/etc/gdm/custom.conf b/centos-6/oVirtLiveFiles/root/etc/gdm/custom.conf similarity index 100% rename from centos/oVirtLiveFiles/root/etc/gdm/custom.conf rename to centos-6/oVirtLiveFiles/root/etc/gdm/custom.conf diff --git a/centos/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf b/centos-6/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf similarity index 100% rename from centos/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf rename to centos-6/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 b/centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 similarity index 100% rename from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 rename to centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 similarity index 100% rename from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 rename to centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt b/centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt similarity index 100% rename from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt rename to centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 b/centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 similarity index 100% rename from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 rename to centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt b/centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt similarity index 100% rename from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt rename to centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt b/centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt similarity index 100% rename from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt rename to centos-6/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt diff --git a/centos/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop b/centos-6/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop similarity index 100% rename from centos/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop rename to centos-6/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer b/centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer similarity index 100% rename from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer rename to centos-6/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer diff --git a/centos/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop b/centos-6/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop rename to centos-6/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override b/centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override rename to centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override b/centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override rename to centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override b/centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override rename to centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override b/centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override rename to centos-6/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py b/centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py rename to centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py diff --git a/centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py b/centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py rename to centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py diff --git a/centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py b/centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py similarity index 100% rename from centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py rename to centos-6/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py diff --git a/centos/.gitignore b/centos-7/.gitignore similarity index 100% copy from centos/.gitignore copy to centos-7/.gitignore diff --git a/centos-7/Makefile b/centos-7/Makefile new file mode 100644 index 0000000..41a8699 --- /dev/null +++ b/centos-7/Makefile @@ -0,0 +1,56 @@ +all: \ + prereq \ + packages \ + livecd \ + $(NULL) + +clean: + rm -fr downloads/*.tmp + rm -fr *.tmp + rm -f kickstart/ovirt-live-ovirt-custom.ks + rm -rf oVirtLiveFiles/iso + +dist-clean: clean + +maintainer-clean: dist-clean + rm -fr downloads + +prereq: + if [ $$(id -u) != 0 ]; then echo "You must be root"; exit 1; fi + +download: \ + downloads/TinyCore-current.iso \ + $(NULL) + +_download: + mkdir -p downloads + rm -f "downloads/$(OUT)" + curl "$(URL)" > "downloads/$(OUT).tmp" + mv "downloads/$(OUT).tmp" "downloads/$(OUT)" + +downloads/TinyCore-current.iso: + $(MAKE) _download URL="http://distro.ibiblio.org/tinycorelinux/6.x/x86/release/TinyCore-current.iso"; OUT="TinyCore-current.iso" + +packages: + rpm -ql livecd-tools > /dev/null 2>&1 || \ + yum install -y \ + http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/livecd-tools-20.1-2.el7.x86_64.rpm \ + http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/python-imgcreate-20.1-2.el7.x86_64.rpm \ + http://people.centos.org/arrfab/CentOS7/LiveMedia/RPMS/hfsplus-tools-540.1.linux3-4.el7.x86_64.rpm + + +.SUFFIXES: +.SUFFIXES: .in +.in: + sed \ + -e "s#@PATH@#$$(pwd)#g" \ + "$<" > "$@" + +livecd: \ + downloads/TinyCore-current.iso \ + kickstart/ovirt-live-ovirt-custom.ks \ + $(NULL) + mkdir -p oVirtLiveFiles/iso + cp downloads/TinyCore-current.iso oVirtLiveFiles/iso/ + setenforce 0 + livecd-creator -d -v --config=kickstart/ovirt-live-ovirt-custom.ks --cache=/home --fslabel=ovirt-live-el7-master 2>&1 | tee iso.log diff --git a/centos-7/kickstart/centos-7-livecd.cfg b/centos-7/kickstart/centos-7-livecd.cfg new file mode 100644 index 0000000..286116f --- /dev/null +++ b/centos-7/kickstart/centos-7-livecd.cfg @@ -0,0 +1,1358 @@ +# based on https://git.centos.org/blob/sig-core!livemedia.git/4b13a251fdb057f4cd095629a0d5c1106959ba43/kickstarts!centos-7-livecd.cfg +#{ ovirt: prefer US over GB +#lang en_GB.UTF-8 +lang en_US.UTF-8 +#} +keyboard us +timezone Europe/Brussels --isUtc +auth --useshadow --enablemd5 +#{ ovirt: avoid issues with selinux +#selinux --enforcing +selinux --permissive +#} +firewall --enabled --service=mdns +xconfig --startxonboot +#{ ovirt: +#part / --size 8192 --fstype ext4 +# 16GB are needed because the ramdisk running the live instance must have at least +# 10GB free for the storage domain. +part / --size 16000 --fstype ext4 +#} +#{ ovirt: +#services --enabled=NetworkManager --disabled=network,sshd +services --enabled=network,sshd,nfs,iptables --disabled=NetworkManager,firewalld +#} + +# Root password +rootpw --iscrypted $6$K2nKf02kVKG68960$OywvoaViphSITuro/liKvCj7Pm/CH/xqzz/lsoXyaKSR1lYf0vHAqSUc483a9MCCBkIwfr/hNMfqwxqVO0OEg1 + +#{ 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/ +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/ +#} + +%packages +abattis-cantarell-fonts +accountsservice +accountsservice-libs +acl +adwaita-cursor-theme +adwaita-gtk2-theme +adwaita-gtk3-theme +aic94xx-firmware +alsa-firmware +alsa-lib +alsa-tools-firmware +anaconda +anaconda-widgets +at +atk +atkmm +at-spi2-atk +at-spi2-core +attr +audit +audit-libs +audit-libs-python +augeas-libs +authconfig +avahi +avahi-autoipd +avahi-glib +avahi-gobject +avahi-libs +avahi-ui-gtk3 +baobab +basesystem +bash +bash-completion +bc +bind-libs +bind-libs-lite +bind-license +bind-utils +binutils +biosdevname +blktrace +bluez +bluez-libs +bridge-utils +btrfs-progs +bzip2 +bzip2-libs +ca-certificates +cairo +cairo-gobject +cairomm +caribou +caribou-gtk2-module +caribou-gtk3-module +cdparanoia-libs +celt051 +checkpolicy +cheese +cheese-libs +chkconfig +chrony +clutter +clutter-gst2 +clutter-gtk +cogl +colord +colord-gtk +colord-libs +color-filesystem +comps-extras +control-center +control-center-filesystem +coreutils +cpio +cracklib +cracklib-dicts +crda +createrepo +cronie +cronie-anacron +crontabs +cryptsetup +cryptsetup-libs +cryptsetup-python +cups-libs +cups-pk-helper +curl +cyrus-sasl-lib +cyrus-sasl-plain +dbus +dbus-glib +dbus-libs +dbus-python +dbus-x11 +dconf +dejavu-fonts-common +dejavu-sans-fonts +dejavu-sans-mono-fonts +dejavu-serif-fonts +deltarpm +desktop-file-utils +device-mapper +device-mapper-event +device-mapper-event-libs +device-mapper-libs +device-mapper-multipath +device-mapper-multipath-libs +device-mapper-persistent-data +dhclient +dhcp-common +dhcp-libs +diffutils +dmidecode +dmraid +dmraid-events +dnsmasq +dosfstools +dracut +dracut-config-rescue +dracut-network +dyninst +e2fsprogs +e2fsprogs-libs +ebtables +ed +elfutils-libelf +elfutils-libs +emacs-filesystem +enchant +eog +ethtool +evince +evince-libs +evince-nautilus +evolution-data-server +exempi +exiv2-libs +expat +fcoe-utils +file +file-libs +file-roller +file-roller-nautilus +filesystem +findutils +fipscheck +fipscheck-lib +firefox +firewall-config +firewalld +firstboot +flac-libs +folks +fontconfig +fontpackages-filesystem +fprintd +fprintd-pam +freerdp +freerdp-libs +freerdp-plugins +freetype +frei0r-plugins +fros +fuse +fuse-libs +fxload +gamin +gavl +gawk +GConf2 +gcr +gd +gdbm +gdisk +gdk-pixbuf2 +gdm +gdm-libs +gedit +geoclue +gettext +gettext-libs +ghostscript +ghostscript-fonts +giflib +gjs +glade-libs +glib2 +glibc +glibc-common +glibmm24 +glib-networking +glusterfs-api +glusterfs-libs +glx-utils +gmp +gnome-bluetooth +gnome-bluetooth-libs +gnome-calculator +gnome-classic-session +gnome-clocks +gnome-color-manager +gnome-contacts +gnome-desktop3 +gnome-dictionary +gnome-disk-utility +gnome-documents +gnome-font-viewer +gnome-icon-theme +gnome-icon-theme-extras +gnome-icon-theme-legacy +gnome-icon-theme-symbolic +gnome-keyring +gnome-keyring-pam +gnome-menus +gnome-online-accounts +gnome-packagekit +gnome-python2 +gnome-python2-bonobo +gnome-python2-canvas +gnome-python2-gnome +gnome-python2-gnomevfs +gnome-screenshot +gnome-session +gnome-session-xsession +gnome-settings-daemon +gnome-settings-daemon-updates +gnome-shell +gnome-shell-extension-alternate-tab +gnome-shell-extension-apps-menu +gnome-shell-extension-common +gnome-shell-extension-launch-new-instance +gnome-shell-extension-places-menu +gnome-shell-extension-window-list +gnome-system-log +gnome-system-monitor +gnome-terminal +gnome-themes-standard +gnome-tweak-tool +gnome-user-docs +gnome-vfs2 +gnome-video-effects +gnu-free-fonts-common +gnu-free-mono-fonts +gnu-free-sans-fonts +gnu-free-serif-fonts +gnupg2 +gnutls +gobject-introspection +google-crosextra-caladea-fonts +google-crosextra-carlito-fonts +gpgme +gpm-libs +graphite2 +grep +grilo +grilo-plugins +groff-base +grub2 +grub2-tools +grubby +gsettings-desktop-schemas +gsm +gssdp +gstreamer1 +gstreamer1-plugins-bad-free +gstreamer1-plugins-base +gstreamer1-plugins-good +gtk2 +gtk2-immodule-xim +gtk3 +gtk3-immodule-xim +gtkmm30 +gtksourceview3 +gtk-vnc2 +gucharmap +gupnp +gupnp-av +gvfs +gvfs-afc +gvfs-afp +gvfs-archive +gvfs-fuse +gvfs-goa +gvfs-gphoto2 +gvfs-mtp +gvfs-smb +gvnc +gzip +hardlink +harfbuzz +harfbuzz-icu +hicolor-icon-theme +hostname +hplip-common +hunspell +hunspell-en +hunspell-en-GB +hunspell-en-US +hwdata +ibus +ibus-chewing +ibus-gtk2 +ibus-gtk3 +ibus-hangul +ibus-libs +ibus-m17n +ibus-rawcode +ibus-sayura +ibus-setup +ibus-table +ibus-table-chinese +imsettings +imsettings-gsettings +imsettings-libs +info +initial-setup +initscripts +iproute +iprutils +iptables +iputils +irqbalance +iscsi-initiator-utils +iscsi-initiator-utils-iscsiuio +iso-codes +isomd5sum +ivtv-firmware +iw +iwl1000-firmware +iwl100-firmware +iwl105-firmware +iwl135-firmware +iwl2000-firmware +iwl2030-firmware +iwl3160-firmware +iwl3945-firmware +iwl4965-firmware +iwl5000-firmware +iwl5150-firmware +iwl6000-firmware +iwl6000g2a-firmware +iwl6000g2b-firmware +iwl6050-firmware +iwl7260-firmware +jansson +jasper-libs +jbigkit-libs +jomolhari-fonts +js +json-c +json-glib +kbd +kbd-misc +kernel +kernel-tools +kernel-tools-libs +kexec-tools +keybinder3 +keyutils-libs +khmeros-base-fonts +khmeros-fonts-common +kmod +kmod-libs +kpartx +kpatch +krb5-libs +langtable +langtable-data +langtable-python +lcms2 +ldns +ledmon +less +libacl +libaio +libarchive +libart_lgpl +libassuan +libasyncns +libatasmart +libattr +libavc1394 +libblkid +libbluray +libbonobo +libbonoboui +libcacard +libcanberra +libcanberra-gtk2 +libcanberra-gtk3 +libcap +libcap-ng +libcdio +libcdio-paranoia +libcgroup +libchewing +libcom_err +libconfig +libcroco +libcurl +libdaemon +libdb +libdb-utils +libdmapsharing +libdmx +libdrm +libdv +libdvdnav +libdvdread +libdwarf +libedit +liberation-fonts-common +liberation-mono-fonts +liberation-sans-fonts +liberation-serif-fonts +libertas-sd8686-firmware +libertas-sd8787-firmware +libertas-usb8388-firmware +libestr +libevent +libexif +libffi +libfontenc +libfprint +libgcc +libgcrypt +libgdata +libgdither +libgee +libgee06 +libglade2 +libgnome +libgnomecanvas +libgnomekbd +libgnome-keyring +libgnomeui +libgomp +libgpg-error +libgphoto2 +libgsf +libgtop2 +libgudev1 +libgusb +libgweather +libgxps +libhangul +libhbaapi +libhbalinux +libical +libICE +libicu +libIDL +libidn +libiec61883 +libieee1284 +libimobiledevice +libiptcdata +libiscsi +libjpeg-turbo +libldb +libmnl +libmodman +libmount +libmtp +libmusicbrainz5 +libndp +libnetfilter_conntrack +libnfnetlink +libnl +libnl3 +libnl3-cli +libnm-gtk +libnotify +liboauth +libogg +libosinfo +libpcap +libpciaccess +libpeas +libpipeline +libplist +libpng +libproxy +libproxy-mozjs +libpwquality +libquvi +libquvi-scripts +libraw1394 +libreport +libreport-anaconda +libreport-cli +libreport-filesystem +libreport-gtk +libreport-plugin-bugzilla +libreport-plugin-mailx +libreport-plugin-reportuploader +libreport-plugin-rhtsupport +libreport-python +libreport-rhel-anaconda-bugzilla +libreport-web +libreswan +librsvg2 +libsamplerate +libsecret +libselinux +libselinux-python +libselinux-utils +libsemanage +libsemanage-python +libsepol +libshout +libsigc++20 +libSM +libsmbclient +libsndfile +libsoup +libspectre +libss +libssh2 +libstdc++ +libstoragemgmt +libstoragemgmt-python +libsysfs +libtalloc +libtar +libtasn1 +libtdb +libteam +libtevent +libthai +libtheora +libtiff +libtool-ltdl +libudisks2 +libunistring +libusb +libusbx +libuser +libuser-python +libutempter +libuuid +libv4l +libverto +libvisual +libvorbis +libvpx +libwacom +libwacom-data +libwbclient +libwebp +libwnck3 +libX11 +libX11-common +libXau +libxcb +libXcomposite +libXcursor +libXdamage +libXdmcp +libXevie +libXext +libXfixes +libXfont +libXft +libXi +libXinerama +libxkbfile +libxklavier +libxml2 +libxml2-python +libXmu +libXpm +libXrandr +libXrender +libXres +libxslt +libXt +libXtst +libXv +libXvMC +libXxf86dga +libXxf86misc +libXxf86vm +libzapojit +linuxconsoletools +linux-firmware +lklug-fonts +lldpad +lm_sensors-libs +lockdev +logrotate +lohit-assamese-fonts +lohit-bengali-fonts +lohit-devanagari-fonts +lohit-gujarati-fonts +lohit-kannada-fonts +lohit-malayalam-fonts +lohit-marathi-fonts +lohit-nepali-fonts +lohit-oriya-fonts +lohit-punjabi-fonts +lohit-tamil-fonts +lohit-telugu-fonts +lsof +lua +lvm2 +lvm2-libs +lzo +m17n-contrib +m17n-db +m17n-lib +m2crypto +madan-fonts +mailx +make +man-db +man-pages +man-pages-overrides +mariadb-libs +marisa +mdadm +mesa-dri-drivers +mesa-filesystem +mesa-libEGL +mesa-libgbm +mesa-libGL +mesa-libglapi +mesa-libxatracker +mesa-private-llvm +metacity +microcode_ctl +mlocate +mobile-broadband-provider-info +ModemManager-glib +mousetweaks +mozilla-filesystem +mozjs17 +mtdev +mtools +mtr +mutter +nano +nautilus +nautilus-extensions +nautilus-open-terminal +nautilus-sendto +ncurses +ncurses-base +ncurses-libs +neon +net-snmp-libs +nettle +net-tools +NetworkManager +NetworkManager-config-server +NetworkManager-glib +NetworkManager-libreswan +NetworkManager-tui +newt +newt-python +nm-connection-editor +nspr +nss +nss-softokn +nss-softokn-freebl +nss-sysinit +nss-tools +nss-util +ntpdate +ntsysv +numactl-libs +obexd +oddjob +oddjob-mkhomedir +openjpeg-libs +openldap +openssh +openssh-clients +openssh-server +openssl +openssl-libs +opus +ORBit2 +orc +os-prober +overpass-fonts +p11-kit +p11-kit-trust +PackageKit +PackageKit-command-not-found +PackageKit-device-rebind +PackageKit-glib +PackageKit-gtk3-module +PackageKit-yum +pakchois +paktype-naskh-basic-fonts +pam +pango +pangomm +paratype-pt-sans-fonts +parted +passwd +pciutils +pciutils-libs +pcre +pcsc-lite-libs +perl +perl-Carp +perl-constant +perl-Encode +perl-Exporter +perl-File-Path +perl-File-Temp +perl-Filter +perl-Getopt-Long +perl-HTTP-Tiny +perl-libs +perl-macros +perl-parent +perl-PathTools +perl-Pod-Escapes +perl-podlators +perl-Pod-Perldoc +perl-Pod-Simple +perl-Pod-Usage +perl-Scalar-List-Utils +perl-Socket +perl-Storable +perl-Text-ParseWords +perl-threads +perl-threads-shared +perl-Time-Local +pinentry +pinentry-gtk +pinfo +pixman +pkgconfig +plymouth +plymouth-core-libs +plymouth-graphics-libs +plymouth-plugin-label +plymouth-plugin-two-step +plymouth-scripts +plymouth-system-theme +plymouth-theme-charge +pm-utils +policycoreutils +policycoreutils-python +polkit +polkit-pkla-compat +poppler +poppler-data +poppler-glib +popt +postfix +ppp +procps-ng +psacct +psmisc +pth +pulseaudio +pulseaudio-gdm-hooks +pulseaudio-libs +pulseaudio-libs-glib2 +pulseaudio-module-bluetooth +pyatspi +pycairo +pygobject2 +pygobject3 +pygobject3-base +pygpgme +pygtk2 +pygtk2-libglade +pykickstart +pyliblzma +pyOpenSSL +pyorbit +pyparted +pytalloc +python +python-backports +python-backports-ssl_match_hostname +python-blivet +python-caribou +python-chardet +python-configobj +python-coverage +python-dateutil +python-decorator +python-deltarpm +python-di +python-dmidecode +python-ethtool +python-gudev +python-hwdata +python-iniparse +python-IPy +python-kitchen +python-libs +python-lxml +python-meh +python-nss +python-pwquality +python-pyblock +python-pycurl +python-pyudev +python-setuptools +python-slip +python-slip-dbus +python-urlgrabber +pytz +pyxattr +qrencode-libs +quota +quota-nls +rdate +readline +realmd +centos-bookmarks +centos-indexhtml +centos-logos +redhat-menus +rest +rfkill +rng-tools +rootfiles +rpm +rpm-build-libs +rpm-libs +rpm-python +rsync +rsyslog +rsyslog-mmjsonparse +rtkit +samba-common +samba-libs +satyr +sbc +scl-utils +SDL +seahorse +sed +selinux-policy +selinux-policy-targeted +setools-libs +setroubleshoot +setroubleshoot-plugins +setroubleshoot-server +setserial +setup +setuptool +sg3_utils-libs +sgpio +shadow-utils +shared-mime-info +sil-abyssinica-fonts +sil-nuosu-fonts +sil-padauk-fonts +slang +smartmontools +smc-fonts-common +smc-meera-fonts +snappy +sos +sound-theme-freedesktop +soundtouch +speex +spice-glib +spice-gtk3 +spice-vdagent +sqlite +sssd-client +startup-notification +stix-fonts +strace +sudo +sushi +syslinux +sysstat +system-config-keyboard +system-config-keyboard-base +systemd +systemd-libs +systemd-python +systemd-sysv +systemtap-runtime +sysvinit-tools +taglib +tar +tcpdump +tcp_wrappers +tcp_wrappers-libs +tcsh +teamd +telepathy-filesystem +telepathy-glib +telepathy-logger +thai-scalable-fonts-common +thai-scalable-waree-fonts +tigervnc-license +tigervnc-server-minimal +time +totem +totem-nautilus +totem-pl-parser +traceroute +tracker +tuned +tzdata +ucs-miscfixed-fonts +udisks2 +unbound-libs +unzip +upower +urw-fonts +usb_modeswitch +usb_modeswitch-data +usbmuxd +usbredir +usbutils +usermode +usermode-gtk +ustr +util-linux +vim-common +vim-enhanced +vim-filesystem +vim-minimal +vinagre +vino +virt-what +vlgothic-fonts +vte3 +wavpack +webkitgtk3 +webrtc-audio-processing +wget +which +words +wpa_supplicant +wqy-microhei-fonts +xcb-util +xdg-user-dirs +xdg-user-dirs-gtk +xdg-utils +xfsdump +xfsprogs +xkeyboard-config +xml-common +xmlrpc-c +xmlrpc-c-client +xorg-x11-drivers +xorg-x11-drv-ati +xorg-x11-drv-dummy +xorg-x11-drv-evdev +xorg-x11-drv-fbdev +xorg-x11-drv-intel +xorg-x11-drv-modesetting +xorg-x11-drv-nouveau +xorg-x11-drv-qxl +xorg-x11-drv-synaptics +xorg-x11-drv-v4l +xorg-x11-drv-vesa +xorg-x11-drv-vmmouse +xorg-x11-drv-vmware +xorg-x11-drv-void +xorg-x11-drv-wacom +xorg-x11-font-utils +xorg-x11-glamor +xorg-x11-server-common +xorg-x11-server-utils +xorg-x11-server-Xorg +xorg-x11-utils +xorg-x11-xauth +xorg-x11-xinit +xorg-x11-xkb-utils +xvattr +xz +xz-libs +yajl +yelp +yelp-libs +yelp-xsl +yum +yum-langpacks +yum-metadata-parser +yum-rhn-plugin +yum-utils +zenity +zip +zlib + +# For UEFI/Secureboot support +grub2 +grub2-efi +efibootmgr +shim + + + +%end + +%post +# FIXME: it'd be better to get this installed from a package +cat > /etc/rc.d/init.d/livesys << EOF +#!/bin/bash +# +# live: Init script for live image +# +# chkconfig: 345 00 99 +# description: Init script for live image. +### BEGIN INIT INFO +# X-Start-Before: display-manager +### END INIT INFO + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then + exit 0 +fi + +if [ -e /.liveimg-configured ] ; then + configdone=1 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +# Make sure we don't mangle the hardware clock on shutdown +ln -sf /dev/null /etc/systemd/system/hwclock-save.service + +livedir="LiveOS" +for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then + livedir=\${arg##rd.live.dir=} + return + fi + if [ "\${arg##live_dir=}" != "\${arg}" ]; then + livedir=\${arg##live_dir=} + return + fi +done + +# enable swaps unless requested otherwise +swaps=\`blkid -t TYPE=swap -o device\` +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then + for s in \$swaps ; do + action "Enabling swap partition \$s" swapon \$s + done +fi +if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then + action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img +fi + +mountPersistentHome() { + # support label/uuid + if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then + homedev=\`/sbin/blkid -o device -t "\$homedev"\` + fi + + # if we're given a file rather than a blockdev, loopback it + if [ "\${homedev##mtd}" != "\${homedev}" ]; then + # mtd devs don't have a block device but get magic-mounted with -t jffs2 + mountopts="-t jffs2" + elif [ ! -b "\$homedev" ]; then + loopdev=\`losetup -f\` + if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then + action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live + fi + losetup \$loopdev \$homedev + homedev=\$loopdev + fi + + # if it's encrypted, we need to unlock it + if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then + echo + echo "Setting up encrypted /home device" + plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" + homedev=/dev/mapper/EncHome + fi + + # and finally do the mount + mount \$mountopts \$homedev /home + # if we have /home under what's passed for persistent home, then + # we should make that the real /home. useful for mtd device on olpc + if [ -d /home/home ]; then mount --bind /home/home /home ; fi + [ -x /sbin/restorecon ] && /sbin/restorecon /home + if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi +} + +findPersistentHome() { + for arg in \`cat /proc/cmdline\` ; do + if [ "\${arg##persistenthome=}" != "\${arg}" ]; then + homedev=\${arg##persistenthome=} + return + fi + done +} + +if strstr "\`cat /proc/cmdline\`" persistenthome= ; then + findPersistentHome +elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then + homedev=/run/initramfs/live/\${livedir}/home.img +fi + +# if we have a persistent /home, then we want to go ahead and mount it +if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then + action "Mounting persistent /home" mountPersistentHome +fi + +# make it so that we don't do writing to the overlay for things which +# are just tmpdirs/caches +mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum +mount -t tmpfs vartmp /var/tmp +[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1 + +if [ -n "\$configdone" ]; then + exit 0 +fi + +# add fedora user with no passwd +action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser +passwd -d liveuser > /dev/null +usermod -aG wheel liveuser > /dev/null + +# Remove root password lock +passwd -d root > /dev/null + +# turn off firstboot for livecd boots +systemctl --no-reload disable firstboot-text.service 2> /dev/null || : +systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || : +systemctl stop firstboot-text.service 2> /dev/null || : +systemctl stop firstboot-graphical.service 2> /dev/null || : + +# don't use prelink on a running live image +sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || : + +# turn off mdmonitor by default +systemctl --no-reload disable mdmonitor.service 2> /dev/null || : +systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || : +systemctl stop mdmonitor.service 2> /dev/null || : +systemctl stop mdmonitor-takeover.service 2> /dev/null || : + +# don't enable the gnome-settings-daemon packagekit plugin +gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || : + +# don't start cron/at as they tend to spawn things which are +# disk intensive that are painful on a live image +systemctl --no-reload disable crond.service 2> /dev/null || : +systemctl --no-reload disable atd.service 2> /dev/null || : +systemctl stop crond.service 2> /dev/null || : +systemctl stop atd.service 2> /dev/null || : + +# Mark things as configured +touch /.liveimg-configured + +# add static hostname to work around xauth bug +# https://bugzilla.redhat.com/show_bug.cgi?id=679486 +echo "localhost" > /etc/hostname + +# Fixing the lang install issue when other lang than English is selected . See http://bugs.centos.org/view.php?id=7217 +/usr/bin/cp /usr/lib/python2.7/site-packages/blivet/size.py /usr/lib/python2.7/site-packages/blivet/size.py.orig +/usr/bin/sed -i "s#return self.humanReadable()#return self.humanReadable().encode('utf-8')#g" /usr/lib/python2.7/site-packages/blivet/size.py + +EOF + +# bah, hal starts way too late +cat > /etc/rc.d/init.d/livesys-late << EOF +#!/bin/bash +# +# live: Late init script for live image +# +# chkconfig: 345 99 01 +# description: Late init script for live image. + +. /etc/init.d/functions + +if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then + exit 0 +fi + +exists() { + which \$1 >/dev/null 2>&1 || return + \$* +} + +touch /.liveimg-late-configured + +# read some variables out of /proc/cmdline +for o in \`cat /proc/cmdline\` ; do + case \$o in + ks=*) + ks="--kickstart=\${o#ks=}" + ;; + xdriver=*) + xdriver="\${o#xdriver=}" + ;; + esac +done + +# if liveinst or textinst is given, start anaconda +if strstr "\`cat /proc/cmdline\`" liveinst ; then + plymouth --quit + /usr/sbin/liveinst \$ks +fi +if strstr "\`cat /proc/cmdline\`" textinst ; then + plymouth --quit + /usr/sbin/liveinst --text \$ks +fi + +# configure X, allowing user to override xdriver +if [ -n "\$xdriver" ]; then + cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE +Section "Device" + Identifier "Videocard0" + Driver "\$xdriver" +EndSection +FOE +fi + +EOF + +chmod 755 /etc/rc.d/init.d/livesys +/sbin/restorecon /etc/rc.d/init.d/livesys +/sbin/chkconfig --add livesys + +chmod 755 /etc/rc.d/init.d/livesys-late +/sbin/restorecon /etc/rc.d/init.d/livesys-late +/sbin/chkconfig --add livesys-late + +# enable tmpfs for /tmp +systemctl enable tmp.mount + +# work around for poor key import UI in PackageKit +rm -f /var/lib/rpm/__db* +releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release) +basearch=$(uname -i) +#{ oVirt +#rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 +#} +echo "Packages within this LiveCD" +rpm -qa +# Note that running rpm recreates the rpm db files which aren't needed or wanted +rm -f /var/lib/rpm/__db* + +# go ahead and pre-make the man -k cache (#455968) +/usr/bin/mandb + +# save a little bit of space at least... +rm -f /boot/initramfs* +# make sure there aren't core files lying around +rm -f /core* + +# convince readahead not to collect +# FIXME: for systemd + +cat >> /etc/rc.d/init.d/livesys << EOF + + +# disable updates plugin +cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE +[org.gnome.settings-daemon.plugins.updates] +active=false +FOE + +# 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 +chmod +x /home/liveuser/Desktop/*.desktop +chown -R liveuser:liveuser /home/liveuser + +# Liveuser face +if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then + cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/liveuser/.face + chown liveuser:liveuser /home/liveuser/.face +fi + +# 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 + # need to move it to anaconda.desktop to make shell happy + #cp /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop +fi + cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE +[org.gnome.shell] +favorite-apps=['liveinst.desktop','firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop'] +FOE + + +# set up auto-login +cat > /etc/gdm/custom.conf << FOE +[daemon] +AutomaticLoginEnable=True +AutomaticLogin=liveuser +FOE + +# Turn off PackageKit-command-not-found while uninstalled +if [ -f /etc/PackageKit/CommandNotFound.conf ]; then + sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf +fi + +# make sure to set the right permissions and selinux contexts +chown -R liveuser:liveuser /home/liveuser/ +restorecon -R /home/liveuser/ + +# Fixing default locale to us +localectl set-keymap us +localectl set-x11-keymap us +EOF + +# rebuild schema cache with any overrides we installed +glib-compile-schemas /usr/share/glib-2.0/schemas + + +%end diff --git a/centos-7/kickstart/ovirt-live-ovirt-custom.ks.in b/centos-7/kickstart/ovirt-live-ovirt-custom.ks.in new file mode 100644 index 0000000..534a6a6 --- /dev/null +++ b/centos-7/kickstart/ovirt-live-ovirt-custom.ks.in @@ -0,0 +1,124 @@ +######################################################################## +# +# oVirt Project LiveCD customization +# +######################################################################## + +# Ensures that the USB3 driver module is available during boot. Required for +# booting on USB3 port. +device xhci-hcd + +rootpw ovirt + +# oVirt repositories +repo --name=ovirt --baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/el7/ +repo --name=ovirtstatic --baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/el7/ +repo --name=patternfly --baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-7-x86_64/ +repo --name=gluster --baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/x86_64/ +repo --name=glusternoarch --baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/noarch + +######################################################################## +# Include kickstart files +######################################################################## + +%include centos-7-livecd.cfg + + +######################################################################## +# Packages +######################################################################## + +%packages +# All in one +ovirt-engine-setup-plugin-allinone +ovirt-log-collector +iptables-services + +# oVirt Live scripts +yad +spice-xpi + +# Useful tools +wireless-tools +system-config-keyboard +system-config-firewall + +# Saving space +-avahi +-bind-utils +-cheese +-ed +-firewall-config +-firewalld +-freerdp +-gnome-calculator +-gnome-clocks +-gnome-color-manager +-gnome-contacts +-gnome-documents +-gnome-font-viewer +-gnome-icon-theme-extras +-gnome-icon-theme-legacy +-gnome-icon-theme-symbolic +-kexec-tools +-libaio +-microcode_ctl +-nautilus-sendto +-psacct +-quota +-quota-nls +-rhythmbox +-setroubleshoot +-setroubleshoot-plugins +-setroubleshoot-server +-smartmontools +-sushi +-telepathy-filesystem +-telepathy-glib +-telepathy-logger +-totem +-tracker +-vinagre +-vino +-yum-rhn-plugin + +%end + +######################################################################## +# Post installation +######################################################################## + +%post --nochroot +cp -r oVirtLiveFiles $INSTALL_ROOT/root/ +%end + +%post + +#enabling iptables +systemctl enable iptables.service +systemctl start iptables.service + +mkdir -p /home/liveuser/oVirtLiveFiles +cp -r /root/oVirtLiveFiles /home/liveuser +echo '10.0.0.1 livecd.localdomain localdomain' >> /etc/hosts + +#workaround for bz 878119 +sed -i 's/\#WDMDOPTS/WDMDOPTS/g' /etc/sysconfig/wdmd + +#configuring autostart +mkdir -p /home/liveuser/.config/autostart + +umask 0027 + +# Updating patched files +cp -r /home/liveuser/oVirtLiveFiles/root/* / + +chmod 666 /etc/xdg/autostart/engine-setup.desktop +chmod 664 /etc/sysconfig/network-scripts/{ifcfg,route,rule}* + +#setting up wallpaper +su -c "gconftool-2 -t str -s /desktop/gnome/background/picture_filename /home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg" - liveuser + +sed -i 's/pc-0.14/rhel6.5.0/' /usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql + +%end diff --git a/centos/oVirtLiveFiles/root/etc/gdm/custom.conf b/centos-7/oVirtLiveFiles/root/etc/gdm/custom.conf similarity index 100% copy from centos/oVirtLiveFiles/root/etc/gdm/custom.conf copy to centos-7/oVirtLiveFiles/root/etc/gdm/custom.conf diff --git a/centos/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf b/centos-7/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf similarity index 100% copy from centos/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf copy to centos-7/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 b/centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 similarity index 100% copy from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 copy to centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 similarity index 100% copy from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 copy to centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt b/centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt similarity index 100% copy from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt copy to centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 b/centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 similarity index 100% copy from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 copy to centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt b/centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt similarity index 100% copy from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt copy to centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/route-ovirtmgmt diff --git a/centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt b/centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt similarity index 100% copy from centos/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt copy to centos-7/oVirtLiveFiles/root/etc/sysconfig/network-scripts/rule-ovirtmgmt diff --git a/centos/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop b/centos-7/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop similarity index 100% copy from centos/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop copy to centos-7/oVirtLiveFiles/root/etc/xdg/autostart/engine-setup.desktop diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/engine-setup-yad.sh diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-icon-128.png Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-setup.png Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.png Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-usb-stick.svg diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg Binary files differ diff --git a/centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer b/centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer similarity index 100% copy from centos/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer copy to centos-7/oVirtLiveFiles/root/home/liveuser/oVirtLiveFiles/ovirt-answer diff --git a/centos/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop b/centos-7/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop copy to centos-7/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override b/centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override copy to centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override b/centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override copy to centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override b/centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override copy to centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override b/centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override copy to centos-7/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override diff --git a/centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py b/centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py copy to centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py diff --git a/centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py b/centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py copy to centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py diff --git a/centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py b/centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py similarity index 100% copy from centos/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py copy to centos-7/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py -- To view, visit http://gerrit.ovirt.org/37564 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a2d90850cf7e4e00511fb506ebce49d5f61564b 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
