Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: refactored on original SL6.5 kickstart
......................................................................
packaging: refactored on original SL6.5 kickstart
Refactored kickstart files in order to be closer to the
original kickstart files taken from SL6.5.
This allow us to understand the changes needed for oVirt Live
in order to ease the rebase for upcoming 6.6 and existing 7.0.
Change-Id: I0eecc9a5f9fb730f94c56f85141c0a725105daf9
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M centos/Makefile
R centos/kickstart/ovirt-live-base.ks
M centos/kickstart/ovirt-live-gnome.ks
A centos/kickstart/ovirt-live-ovirt-custom.ks.in
4 files changed, 225 insertions(+), 77 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/13/32113/1
diff --git a/centos/Makefile b/centos/Makefile
index ba07798..ea37d33 100644
--- a/centos/Makefile
+++ b/centos/Makefile
@@ -7,7 +7,7 @@
clean:
rm -fr downloads/*.tmp
rm -fr *.tmp
- rm -f kickstart/ovirt-live-base.ks
+ rm -f kickstart/ovirt-live-ovirt-custom.ks
rm -rf oVirtLiveFiles/iso
dist-clean: clean
@@ -60,8 +60,8 @@
livecd: \
repo \
downloads/TinyCore-current.iso \
- kickstart/ovirt-live-base.ks \
+ kickstart/ovirt-live-ovirt-custom.ks \
$(NULL)
mkdir -p oVirtLiveFiles/iso
cp downloads/TinyCore-current.iso oVirtLiveFiles/iso/
- livecd-creator -d -v --config=kickstart/ovirt-live-gnome.ks
--cache=/home --fslabel=ovirt-live-el6-master > iso.log 2>&1
+ livecd-creator -d -v --config=kickstart/ovirt-live-ovirt-custom.ks
--cache=/home --fslabel=ovirt-live-el6-master 2>&1 | tee iso.log
diff --git a/centos/kickstart/ovirt-live-base.ks.in
b/centos/kickstart/ovirt-live-base.ks
similarity index 93%
rename from centos/kickstart/ovirt-live-base.ks.in
rename to centos/kickstart/ovirt-live-base.ks
index 9e7177b..3e51a93 100644
--- a/centos/kickstart/ovirt-live-base.ks.in
+++ b/centos/kickstart/ovirt-live-base.ks
@@ -2,33 +2,48 @@
#
# ovirt-live-base.ks
#
+# Defines the basics for all kickstarts of ovirt-live
# Kickstarts including this template can override these settings
#
########################################################################
+
+# Based on
+#
https://svn.iac.ethz.ch/websvn/pub/websvn-pub/wsvn/livecd/trunk/SL6/livecd-config/sl65-live-base.ks
lang en_US.UTF-8
keyboard us
timezone US/Eastern
auth --useshadow --enablemd5
+#{ ovirt: avoid issues with selinux
+#selinux --enforcing
selinux --permissive
+#}
firewall --enabled --service=mdns
-# Ensures that the USB3 driver module is available during boot. Required for
-# booting on USB3 port.
-device xhci-hcd
+#{ ovirt: prefer CentOS over SL
+# SL repositories
+#repo --name=base
--baseurl=http://ftp.scientificlinux.org/linux/scientific/6.5/$basearch/os/
+#repo --name=security
--baseurl=http://ftp.scientificlinux.org/linux/scientific/6.5/$basearch/updates/security/
+#repo --name=sl-addons
--baseurl=http://ftp.scientificlinux.org/linux/scientific/6.5/$basearch/addons/
repo --name=base
--mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
repo --name=updates
--mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates
repo --name=epel
--mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch
-repo --name=ovirt
--baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/el$releasever/
-repo --name=ovirtstatic
--baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/el$releasever/
-repo --name=patternfly
--baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-6-$basearch/
-repo --name=gluster
--baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/$basearch/
-repo --name=glusternoarch
--baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/noarch
-repo --name=local --baseurl=file://@PATH@/oVirtLiveFiles/rpms/
+
+#}
+# or use a mirror close to you
+#repo --name=base
--baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/6.5/$basearch/os/
+#repo --name=security
--baseurl=http://mirror.switch.ch/ftp/mirror/scientificlinux/6.5/$basearch/updates/security/
+
+# fastbugs is disabled
+#repo --name=fastbugs
--baseurl=http://ftp.scientificlinux.org/linux/scientific/6.5/$basearch/updates/fastbugs/
xconfig --startxonboot
+#{ ovirt:
+#services --enabled=NetworkManager --disabled=network,sshd
services --enabled=network,sshd,nfs,NetworkManager
+#}
+
########################################################################
#
@@ -58,11 +73,18 @@
busybox
mailx
memtest86+
+#{ ovirt:
+#Not needed
+#livecd-tools
+#}
fuse
wpa_supplicant
dracut-network
-system-config-firewall-base
yum-plugin-fastestmirror
+
+#{ ovirt:
+system-config-firewall-base
+#}
# livecd bits to set up the livecd and be able to install
anaconda
@@ -350,12 +372,21 @@
/usr/sbin/useradd -c "LiveCD default user" \\\$LIVECD_USER
/usr/bin/passwd -d \\\$LIVECD_USER > /dev/null
# give default user sudo privileges
+# echo "\\\$LIVECD_USER ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+#{ ovirt: enable sudo privileges
echo "\\\$LIVECD_USER ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+#}
### set password
if [ "\\\$PW" ]; then
echo \\\$PW | passwd --stdin root >/dev/null
echo \\\$PW | passwd --stdin \\\$LIVECD_USER >/dev/null
+#{ ovirt: avoid empty password
+#else
+# # set empty password
+# sed -i "s|^root:[^:]*:|root::|" /etc/shadow
+# sed -i "s|^\\\$LIVECD_USER:[^:]*:|\\\$LIVECD_USER::|" /etc/shadow
+#}
fi
### enable auto-login
@@ -761,9 +792,15 @@
\$LIVE_ROOT/isolinux/localboot.txt > \$LIVE_ROOT/isolinux/isolinux.cfg
rm -f \$LIVE_ROOT/isolinux/*.txt
+# Forcing plymouth to show the logo in vesafb
+#{ ovirt: avoid forcing plymouth to show the logo
+#sed -i "s/rhgb/rhgb vga=791/g" \$LIVE_ROOT/isolinux/isolinux.cfg
+#}
+
EOF_postnochroot
# run postnochroot-install script
/bin/bash -x /root/postnochroot-install 2>&1 | tee
/root/postnochroot-install.log
%end
+
diff --git a/centos/kickstart/ovirt-live-gnome.ks
b/centos/kickstart/ovirt-live-gnome.ks
index c8a9503..5eddb00 100644
--- a/centos/kickstart/ovirt-live-gnome.ks
+++ b/centos/kickstart/ovirt-live-gnome.ks
@@ -6,14 +6,23 @@
#
########################################################################
+# Based on
+#
https://svn.iac.ethz.ch/websvn/pub/websvn-pub/wsvn/livecd/trunk/SL6/livecd-config/sl65-livecd-gnome.ks
+
+#{ ovirt
+#part / --size 4096 --fstype ext4
part / --size 16000 --fstype ext4
+#}
########################################################################
# Include kickstart files
########################################################################
+#{ovirt
+#%include sl65-live-base.ks
+#%include sl65-extra-software.ks
%include ovirt-live-base.ks
-rootpw ovirt
+#}
########################################################################
# Packages
@@ -32,7 +41,6 @@
-quota
-autofs
-smartmontools
-yad
@basic-desktop
# package removed from @basic-desktop
@@ -42,6 +50,9 @@
# packages removed from @desktop-platform
-redhat-lsb
+#{ovirt
+#@dial-up
+#}
@fonts
@@ -69,6 +80,8 @@
@internet-browser
+### SL LiveCD specific changes
+
## packages to remove to save diskspace
-evolution
-evolution-help
@@ -86,29 +99,57 @@
-pinfo
-vim-common
-vim-enhanced
+#{ovirt
+#-system-config-printer
+#-system-config-printer-udev
+#-system-config-printer-libs
+#}
-samba-common
-samba-client
+#{ovirt
+#-cifs-utils
+#-gvfs-smb
+#-gnome-vfs2-smb
+#-libsmbclient
+#-samba-winbind
+#-samba-winbind-clients
+#}
-mousetweaks
-patch
-ovirt-engine
-ovirt-engine-setup-plugin-allinone
-bridge-utils
-net-tools
-firefox
-m2crypto
-seabios
-vdsm-cli
-vdsm-xmlrpc
-ovirt-host-deploy-offline
-vim
-net-tools
-bridge-utils
-shadow-utils
-apr
-httpd
-ovirt-log-collector
-ovirt-image-uploader
-jboss-as
+#{ovirt
+#-foomatic-db-ppds
+#-redhat-lsb-printing
+#-eog
+#-qt
+#-gcalctool
+#-gnome-system-monitor
+#-nc
+#-minicom
+#}
+#gnome-utils-libs
+#gnome-utils
+
+#brasero
+#{ovirt
+#-brasero-nautilus
+#-brasero-libs
+#-brasero
+#-libburn
+#-vorbis-tools
+#-libisofs
+#}
+
+# pidgin
+#{ovirt
+#-pidgin
+#-gssdp
+#-farsight2
+#-gupnp
+#-gupnp-igd
+#-libnice
+#-libpurple
+#-gtkspell
+#-meanwhile
+#}
## remove some fonts and input methods
# remove Chinese font (Ming face) (8.9 MB)
@@ -120,20 +161,24 @@
-libhangul
## packages to add
-lftp
+#{ovirt
+#thunderbird
-thunderbird
-#@openafs-client
-cups
-cups-pk-helper
-system-config-printer
-system-config-printer-udev
+#}
xorg-x11-fonts-100dpi
xorg-x11-fonts-ISO8859-1-100dpi
xorg-x11-fonts-Type1
nautilus-sendto
-spice-client
-spice-xpi
-phonon-backend-gstreamer
+
+## packages which are no longer included
+# @openafs-client
+# system-config-printer
+# system-config-printer-udev
+# phonon-backend-gstreamer
+# cups
+# cups-pk-helper
+# lftp
+# spice-client
%end
@@ -142,44 +187,11 @@
# Post installation
########################################################################
-%post --nochroot
-cp -r oVirtLiveFiles $INSTALL_ROOT/root/
-%end
-
-
%post
-
-mkdir -p /home/liveuser/oVirtLiveFiles
-
-cp -r /root/oVirtLiveFiles /home/liveuser
-
-yum localinstall -y /home/liveuser/oVirtLiveFiles/rpms/*.rpm
-
-echo '10.0.0.1 livecd.localdomain localdomain' >> /etc/hosts
# remove folders/files that use a lot of diskspace
# and are not really needed for LiveCD
rm -rf /usr/share/doc/openafs-*
rm -rf /usr/share/doc/testdisk-*
-
-#workaround for bz 878119
-#echo 'blacklist iTCO_wdt' >> /etc/modprobe.d/blacklist.conf
-#echo 'blacklist iTCO_vendor_support' >> /etc/modprobe.d/blacklist.conf
-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
-
-#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.4.0/'
/usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql
%end
diff --git a/centos/kickstart/ovirt-live-ovirt-custom.ks.in
b/centos/kickstart/ovirt-live-ovirt-custom.ks.in
new file mode 100644
index 0000000..dbf0db6
--- /dev/null
+++ b/centos/kickstart/ovirt-live-ovirt-custom.ks.in
@@ -0,0 +1,99 @@
+########################################################################
+#
+# 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/el$releasever/
+repo --name=ovirtstatic
--baseurl=http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/el$releasever/
+repo --name=patternfly
--baseurl=http://copr-be.cloud.fedoraproject.org/results/patternfly/patternfly1/epel-6-$basearch/
+repo --name=gluster
--baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/$basearch/
+repo --name=glusternoarch
--baseurl=http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-$releasever/noarch
+repo --name=local --baseurl=file://@PATH@/oVirtLiveFiles/rpms/
+
+########################################################################
+# Include kickstart files
+########################################################################
+
+%include ovirt-live-gnome.ks
+
+
+########################################################################
+# Packages
+########################################################################
+
+%packages
+patch
+ovirt-engine
+ovirt-engine-setup-plugin-allinone
+bridge-utils
+net-tools
+firefox
+m2crypto
+seabios
+vdsm-cli
+vdsm-xmlrpc
+ovirt-host-deploy-offline
+vim
+net-tools
+bridge-utils
+shadow-utils
+apr
+httpd
+ovirt-log-collector
+ovirt-image-uploader
+jboss-as
+yad
+cups
+cups-pk-helper
+system-config-printer
+system-config-printer-udev
+spice-client
+spice-xpi
+phonon-backend-gstreamer
+lftp
+%end
+
+########################################################################
+# Post installation
+########################################################################
+
+%post --nochroot
+cp -r oVirtLiveFiles $INSTALL_ROOT/root/
+%end
+
+%post
+
+mkdir -p /home/liveuser/oVirtLiveFiles
+cp -r /root/oVirtLiveFiles /home/liveuser
+yum localinstall -y /home/liveuser/oVirtLiveFiles/rpms/*.rpm
+echo '10.0.0.1 livecd.localdomain localdomain' >> /etc/hosts
+
+#workaround for bz 878119
+#echo 'blacklist iTCO_wdt' >> /etc/modprobe.d/blacklist.conf
+#echo 'blacklist iTCO_vendor_support' >> /etc/modprobe.d/blacklist.conf
+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
+
+#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.4.0/'
/usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql
+
+%end
--
To view, visit http://gerrit.ovirt.org/32113
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eecc9a5f9fb730f94c56f85141c0a725105daf9
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
