Alon Bar-Lev has posted comments on this change.
Change subject: packaging: initial repo creation
......................................................................
Patch Set 18: (12 inline comments)
....................................................
File build.sh
Line 1: #!/usr/bin/sh
Line 2: yum install -y spin-kickstarts.noarch
Line 3: yum install -y livecd-tools
Line 4: cp -f /usr/share/spin-kickstarts/fedora-live-base.ks
./kickstart/ovirt-live-base.ks
Line 5: sed -i 's/selinux \-\-enforcing/selinux \-\-permissive/g'
./kickstart/ovirt-live-base.ks
please provide these seds as patch.
Line 6: sed -i 's/services \-\-enabled\=NetworkManager
\-\-disabled\=network\,sshd/services \-\-enabled\=NetworkManager\,sshd
\-\-disabled\=network\,firewalld\nrepo \-\-name\=ovirt
\-\-baseurl\=http:\/\/ovirt.org\/releases\/nightly\/rpm\/Fedora\/18/g'
./kickstart/ovirt-live-base.ks
Line 7: sed -i 's/liveuser/oVirtuser/g' ./kickstart/ovirt-live-base.ks
Line 8: sed -i 's/firewall \-\-enabled/firewall \-\-disabled/g'
./kickstart/ovirt-live-base.ks
Line 9: sed -i 's/livedir\=\"LiveOS\"/livedir\=\"LiveoVirt\"/g'
./kickstart/ovirt-live-base.ks
....................................................
File kickstart/ovirt.ks
Line 72: mkdir /root/oVirtLiveFiles/
Line 73: echo "making autostart dir"
Line 74: mkdir -p ~oVirtuser/.config/autostart
Line 75:
Line 76: cat >> /etc/rc.d/init.d/livesys << EOF
can we put this as external file?
Line 77:
Line 78: # make the installer show up
Line 79: if [ -f /usr/share/applications/liveinst.desktop ]; then
Line 80: # Show harddisk install in shell dash
Line 75:
Line 76: cat >> /etc/rc.d/init.d/livesys << EOF
Line 77:
Line 78: # make the installer show up
Line 79: if [ -f /usr/share/applications/liveinst.desktop ]; then
this too?
Line 80: # Show harddisk install in shell dash
Line 81: sed -i -e 's/NoDisplay=true/NoDisplay=false/'
/usr/share/applications/liveinst.desktop ""
Line 82: # need to move it to anaconda.desktop to make shell happy
Line 83: mv /usr/share/applications/liveinst.desktop
/usr/share/applications/anaconda.desktop
Line 81: sed -i -e 's/NoDisplay=true/NoDisplay=false/'
/usr/share/applications/liveinst.desktop ""
Line 82: # need to move it to anaconda.desktop to make shell happy
Line 83: mv /usr/share/applications/liveinst.desktop
/usr/share/applications/anaconda.desktop
Line 84:
Line 85: cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
<< FOE
this too?
Line 86: [org.gnome.shell]
Line 87: favorite-apps=['ovirt.desktop' ,
'engine-setup.desktop','firefox.desktop', 'evolution.desktop',
'empathy.desktop', 'shotwell.desktop', 'nautilus.desktop', 'anaconda.desktop']
Line 88: FOE
Line 89:
Line 111:
Line 112: # Add oVirtuser to sudoers
Line 113: /sbin/usermod -g wheel oVirtuser
Line 114:
Line 115: sed -i 's/utils.retry(isHostUp, tries=20, timeout=150,
sleep=5)/utils.retry(isHostUp, tries=100, timeout=600, sleep=5)/g'
/usr/share/ovirt-engine/scripts/plugins/all_in_one_100.py
better to allow all_in_one to accept extra parameters than to hack it, it is
our script after all.
Line 116: # No reboot is needed in AIO, so manager should not wait
Line 117: sed -i "s/'ServerRebootTimeout','300'/'ServerRebootTimeout','0'/g"
/usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql
Line 118: # Allow wlan* on host (as we're running locally)
Line 119: sed -i -e 's/# hidden_nics = wlan\*,usb\*/hidden_nics = usb\*/'
/etc/vdsm/vdsm.conf
Line 113: /sbin/usermod -g wheel oVirtuser
Line 114:
Line 115: sed -i 's/utils.retry(isHostUp, tries=20, timeout=150,
sleep=5)/utils.retry(isHostUp, tries=100, timeout=600, sleep=5)/g'
/usr/share/ovirt-engine/scripts/plugins/all_in_one_100.py
Line 116: # No reboot is needed in AIO, so manager should not wait
Line 117: sed -i "s/'ServerRebootTimeout','300'/'ServerRebootTimeout','0'/g"
/usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql
this should be done using engine-config -s ServerRebootTimeout=300
Line 118: # Allow wlan* on host (as we're running locally)
Line 119: sed -i -e 's/# hidden_nics = wlan\*,usb\*/hidden_nics = usb\*/'
/etc/vdsm/vdsm.conf
Line 120: sed -i 's/\[vars\]/\[vars\]\nfake_nics\ \=\ \dummy0/g'
/etc/vdsm/vdsm.conf
Line 121: %end
Line 116: # No reboot is needed in AIO, so manager should not wait
Line 117: sed -i "s/'ServerRebootTimeout','300'/'ServerRebootTimeout','0'/g"
/usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql
Line 118: # Allow wlan* on host (as we're running locally)
Line 119: sed -i -e 's/# hidden_nics = wlan\*,usb\*/hidden_nics = usb\*/'
/etc/vdsm/vdsm.conf
Line 120: sed -i 's/\[vars\]/\[vars\]\nfake_nics\ \=\ \dummy0/g'
/etc/vdsm/vdsm.conf
I think we can provide our own vdsm.conf and not edit in-place.
Line 121: %end
Line 122:
Line 123: %post --nochroot
Line 124: cp -r oVirtLiveFiles $INSTALL_ROOT/root/
Line 143: #configuring autologin
Line 144: sed -i
's/\[daemon\]/\[daemon\]\nAutomaticLoginEnable\=True\nAutomaticLogin\=oVirtuser/g'
/etc/gdm/custom.conf
Line 145:
Line 146: #settings up vdsm to use a dummy nic
Line 147: cp /home/oVirtuser/oVirtLiveFiles/50-vdsm-conf-fake-nic.conf
/etc/ovirt-host-deploy.conf.d/
you can create a link?
Anyway, installing at /home/ is not wise as the permissions of /home are unique
to user, best to install files at /usr/share/
Line 148: echo '10.0.0.1 ovirtlive.localdomain localdomain' >> /etc/hosts
Line 149:
Line 150: #setting wallapaper
Line 151: cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg
/usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
Line 149:
Line 150: #setting wallapaper
Line 151: cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg
/usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png
Line 152: cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg
/usr/share/backgrounds/spherical-cow/default/wide/spherical-cow.png
Line 153: cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg
/usr/share/backgrounds/spherical-cow/default/normalish/spherical-cow.png
I expect something like:
cp -r /usr/share/ovirt-live/files/* /
Line 154:
Line 155: #copying network files
Line 156: cp /home/oVirtuser/oVirtLiveFiles/etc/sysconfig/network-scripts/*
/etc/sysconfig/network-scripts/
Line 157:
Line 164: #setting up autologin
Line 165: cp /home/oVirtuser/oVirtLiveFiles/etc/gdm/* /etc/gdm/
Line 166:
Line 167: #overriding glib schemas
Line 168: cp /home/oVirtuser/oVirtLiveFiles/usr/share/glib-2.0/schemas/*
/usr/share/glib-2.0/schemas/
it solves all the above.
Line 169:
Line 170: glib-compile-schemas /usr/share/glib-2.0/schemas
Line 171:
Line 172: #workaround for bz 878119
Line 176: yum localinstall -y /home/oVirtuser/oVirtLiveFiles/rpms/*.rpm
Line 177:
Line 178: #updating patched files
Line 179: cp /home/oVirtuser/oVirtLiveFiles/ovirt_live_101.py
/usr/share/ovirt-engine/scripts/plugins/
Line 180: cp /home/oVirtuser/oVirtLiveFiles/ovirt_live_101.py
/usr/share/ovirt-engine/scripts/
same as above.
Line 181:
Line 182:
Line 183: # Manipulate fqdn validation, so that it is possible to setup with
answer file
Line 184: sed -i 's/raise Exception(output_messages.ERR_EXP_VALIDATE_PARAM %
param.getKey("CONF_NAME"))/logging.debug("Failed to validate %s with value
%s",param,paramValue)/g' /usr/share/ovirt-engine/scripts/engine-setup.py
Line 180: cp /home/oVirtuser/oVirtLiveFiles/ovirt_live_101.py
/usr/share/ovirt-engine/scripts/
Line 181:
Line 182:
Line 183: # Manipulate fqdn validation, so that it is possible to setup with
answer file
Line 184: sed -i 's/raise Exception(output_messages.ERR_EXP_VALIDATE_PARAM %
param.getKey("CONF_NAME"))/logging.debug("Failed to validate %s with value
%s",param,paramValue)/g' /usr/share/ovirt-engine/scripts/engine-setup.py
patch please
Line 185: sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config
Line 186: #yad script - give some gui to installation
Line 187:
Line 188: echo "finishing post section"
--
To view, visit http://gerrit.ovirt.org/9733
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I66cca8f5d5abaa710f054c59043ff6363b68256f
Gerrit-PatchSet: 18
Gerrit-Project: ovirt-live
Gerrit-Branch: master
Gerrit-Owner: Moran Goldboim <[email protected]>
Gerrit-Reviewer: Alex Lourie <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Eyal Edri <[email protected]>
Gerrit-Reviewer: Federico Simoncelli <[email protected]>
Gerrit-Reviewer: Juan Hernandez <[email protected]>
Gerrit-Reviewer: Kiril Nesenko <[email protected]>
Gerrit-Reviewer: Moran Goldboim <[email protected]>
Gerrit-Reviewer: Ofer Schreiber <[email protected]>
Gerrit-Reviewer: Ohad Basan <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
