Kiril Nesenko has posted comments on this change. Change subject: packaging: initial repo creation ......................................................................
Patch Set 3: I would prefer that you didn't submit this (19 inline comments) .................................................... File kickstart/ovirt.ks Line 3: # mailto:desk...@lists.fedoraproject.org Line 4: Line 5: %include ovirt-live-base.ks Line 6: Line 7: part / --size 16000 remove white-spaces Line 8: rootpw --iscrypted $1$Idf9Mf5B$lmQBHtDcnO4Xd53vqFWqT. Line 9: authconfig --enableshadow --passalgo=sha512 --enablefingerprint Line 10: timezone --utc Asia/Jerusalem Line 11: Line 62: Line 63: %post #--nochroot --log=/tmp/my-post-log Line 64: #!/bin/sh Line 65: set -x -v Line 66: OVIRT_USER="oVirtUser" OVIRT_PASSWD="$OVIRT_USER" Use this variable in the script. Replace oVirtUser with "$OVIRT_USER" Line 67: echo "starting post secion" Line 68: echo "adding user" Line 69: /sbin/useradd oVirtuser; echo oVirtuser |passwd oVirtuser --stdin Line 70: echo "making dir /root/oVirtLiveFiles/" Line 91: active=false Line 92: FOE Line 93: Line 94: # make the installer show up Line 95: if [ -f /usr/share/applications/liveinst.desktop ]; then LIVEINST_DESKTOP="/usr/share/applications/liveinst.desktop" if [ -f "$LIVEINST_DESKTOP" ] Line 96: # Show harddisk install in shell dash Line 97: sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" Line 98: # need to move it to anaconda.desktop to make shell happy Line 99: mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop Line 93: Line 94: # make the installer show up Line 95: if [ -f /usr/share/applications/liveinst.desktop ]; then Line 96: # Show harddisk install in shell dash Line 97: sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" use "$LIVEINST_DESKTOP" Line 98: # need to move it to anaconda.desktop to make shell happy Line 99: mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop Line 100: Line 101: cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE Line 95: if [ -f /usr/share/applications/liveinst.desktop ]; then Line 96: # Show harddisk install in shell dash Line 97: sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" Line 98: # need to move it to anaconda.desktop to make shell happy Line 99: mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop use "$LIVEINST_DESKTOP" Line 100: Line 101: cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE Line 102: [org.gnome.shell] Line 103: favorite-apps=['ovirt.desktop' , 'engine-setup.desktop','firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'shotwell.desktop', 'nautilus.desktop', 'anaconda.desktop'] Line 123: FOE Line 124: Line 125: Line 126: # Turn off PackageKit-command-not-found while uninstalled Line 127: if [ -f /etc/PackageKit/CommandNotFound.conf ]; then make it same as above with variables Line 128: sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf Line 129: fi Line 130: Line 131: EOF Line 130: Line 131: EOF Line 132: Line 133: # Add ovirt repo Line 134: cat << EOF > /etc/yum.repos.d/ovirt.repo here as well Line 135: [ovirt-stable] Line 136: name=Stable builds of the oVirt project Line 137: baseurl=http://ovirt.org/releases/stable/rpm/Fedora/18/ Line 138: enabled=0 Line 223: Line 224: Line 225: Line 226: # Create desktop shortcuts for setup and engine web page Line 227: cat << EOF > /usr/share/applications/engine-setup.desktop remove Line 228: [Desktop Entry] Line 229: Type=Application Line 230: Encoding=UTF-8 Line 231: Version=1.0 Line 236: X-GNOME-Autostart-Delay=5 Line 237: Icon=/home/oVirtuser/oVirtLiveFiles/ovirt-setup.png Line 238: EOF Line 239: Line 240: cat << EOF > /usr/share/applications/ovirt.desktop remove Line 241: [Desktop Entry] Line 242: Type=Application Line 243: Encoding=UTF-8 Line 244: Version=1.0 Line 263: sed -i -e 's/# hidden_nics = wlan\*,usb\*/hidden_nics = usb\*/' /etc/vdsm/vdsm.conf Line 264: sed -i 's/\[vars\]/\[vars\]\nfake_nics\ \=\ \dummy0/g' /etc/vdsm/vdsm.conf Line 265: %end Line 266: Line 267: %post --nochroot and here Line 268: cp -r oVirtLiveFiles $INSTALL_ROOT/root/ Line 269: %end Line 270: Line 271: # Last misc changes here: Line 306: Line 307: #revert host-deploy patch Line 308: cp /home/oVirtuser/oVirtLiveFiles/0001-vdsm-bridge-handle-engine-at-loopback-all-in-one.patch /usr/share/ovirt-host-deploy/plugins/ovirt-host-deploy/vdsm Line 309: pushd /usr/share/ovirt-host-deploy/plugins/ovirt-host-deploy/vdsm Line 310: patch -R < 0001-vdsm-bridge-handle-engine-at-loopback-all-in-one.patch remove Line 311: popd Line 312: Line 313: #updating patched files Line 314: cp /home/oVirtuser/oVirtLiveFiles/ovirt_live_101.py /usr/share/ovirt-engine/scripts/plugins/ .................................................... File oVirtLiveFiles/0001-vdsm-bridge-handle-engine-at-loopback-all-in-one.patch Line 21: --- a/src/plugins/ovirt-host-deploy/vdsm/bridge.py Line 22: +++ b/src/plugins/ovirt-host-deploy/vdsm/bridge.py Line 23: @@ -58,33 +58,6 @@ class Plugin(plugin.PluginBase): Line 24: """ Line 25: remove whitespaces Line 26: """ Line 27: - 3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP... Line 28: - link/ether 00:0e:bf:44:0d:1f brd ff:ff:ff:ff:ff:ff Line 29: - inet 192.168.0.104/24 brd 192.168.0.255 scope global wlan0 .................................................... File oVirtLiveFiles/configure-network.sh Line 1: #!/bin/bash Line 2: ifup ovirtmgmt Line 3: ifconfig dummy0 10.0.0.1 netmask 255.255.255.0 Why 10.0.0.1 ? Line 4: brctl addbr ovirtmgmt Line 5: brctl addif ovirtmgmt dummy0 .................................................... File oVirtLiveFiles/engine-setup-yad.sh Line 1: #! /bin/bash Line 2: # TODO remove Line 3: Line 4: sudo ifconfig dummy0 10.0.0.1 netmask 255.255.255.0 Line 5: sudo ifup ovirtmgmt Line 6: sudo brctl addbr ovirtmgmt Line 1: #! /bin/bash Line 2: # TODO Line 3: Line 4: sudo ifconfig dummy0 10.0.0.1 netmask 255.255.255.0 why 10.0.0.1 ? Line 5: sudo ifup ovirtmgmt Line 6: sudo brctl addbr ovirtmgmt Line 7: sudo brctl addif ovirtmgmt dummy0 Line 8: Line 21: --entry-text \ Line 22: "automatic" "interactive") Line 23: ret=$? Line 24: Line 25: [[ $ret -eq 1 ]] && exit 0 [ "$ret" - eq 1 ] Line 26: Line 27: if [[ $ret -eq 2 ]]; then Line 28: gdmflexiserver --startnew & Line 29: exit 0 Line 23: ret=$? Line 24: Line 25: [[ $ret -eq 1 ]] && exit 0 Line 26: Line 27: if [[ $ret -eq 2 ]]; then same as above Line 28: gdmflexiserver --startnew & Line 29: exit 0 Line 30: fi Line 31: Line 31: Line 32: case $action in Line 33: automatic*) cmd="sudo /usr/bin/engine-setup --answer-file=/home/oVirtuser/oVirtLiveFiles/ovirt-answer" ;; Line 34: interactive*) cmd="gnome-terminal --command=\"sudo /usr/bin/engine-setup\";sleep 20" ;; Line 35: *) exit 1 ;; remove Line 36: esac Line 37: Line 38: echo "excecuting $cmd" Line 39: $cmd Line 36: esac Line 37: Line 38: echo "excecuting $cmd" Line 39: $cmd Line 40: if [[ $? -eq 0 ]]; then if $cmd ; then Line 41: echo "setup ended successfully" Line 42: rm -f ~oVirtuser/.config/autostart/engine-setup.desktop Line 43: yad --text "setup ended successfully\nopening ovirt-engine now on htts://localhost.localdomain" --button="gtk-ok:0" Line 44: /bin/firefox https://localhost.localdomain & -- 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: 3 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Moran Goldboim <mgold...@redhat.com> Gerrit-Reviewer: Alex Lourie <alou...@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Eyal Edri <ee...@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com> Gerrit-Reviewer: Kiril Nesenko <knese...@redhat.com> Gerrit-Reviewer: Moran Goldboim <mgold...@redhat.com> Gerrit-Reviewer: Ofer Schreiber <oschr...@redhat.com> Gerrit-Reviewer: Ohad Basan <oba...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
