Kiril Nesenko has uploaded a new change for review. Change subject: Change the code style of build.sh ......................................................................
Change the code style of build.sh Change-Id: Iffb6b46b5e1b64f16e2e77b954dd7c2251298d46 Signed-off-by: Kiril Nesenko <knese...@redhat.com> --- M build.sh 1 file changed, 19 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/42/14342/1 diff --git a/build.sh b/build.sh index 8639fcb..169a2d2 100755 --- a/build.sh +++ b/build.sh @@ -1,18 +1,24 @@ #!/usr/bin/sh -yum install -y spin-kickstarts.noarch -yum install -y livecd-tools -cp -f /usr/share/spin-kickstarts/fedora-live-base.ks ./kickstart/ovirt-live-base.ks -sed -i 's/selinux \-\-enforcing/selinux \-\-permissive/g' ./kickstart/ovirt-live-base.ks -sed -i 's/services \-\-enabled\=NetworkManager \-\-disabled\=network\,sshd/services \-\-enabled\=NetworkManager\,sshd \-\-disabled\=network\,firewalld\nrepo \-\-name\=ovirt \-\-baseurl\=http:\/\/ovirt.org\/releases\/stable\/rpm\/Fedora\/18/g' ./kickstart/ovirt-live-base.ks +yum install -y spin-kickstarts.noarch livecd-tools +cp -f /usr/share/spin-kickstarts/fedora-live-base.ks kickstart/ovirt-live-base.ks +sed -i 's/selinux \-\-enforcing/selinux \-\-permissive/g' kickstart/ovirt-live-base.ks +sed -i 's/services \-\-enabled\=NetworkManager \-\-disabled\=network\,sshd/services \-\-enabled\=NetworkManager\,sshd \-\-disabled\=network\,firewalld\nrepo \-\-name\=ovirt \-\-baseurl\=http:\/\/ovirt.org\/releases\/stable\/rpm\/Fedora\/18/g' kickstart/ovirt-live-base.ks sed -i 's/liveuser/oVirtuser/g' ./kickstart/ovirt-live-base.ks -sed -i 's/firewall \-\-enabled/firewall \-\-disabled/g' ./kickstart/ovirt-live-base.ks -sed -i 's/livedir\=\"LiveOS\"/livedir\=\"LiveoVirt\"/g' ./kickstart/ovirt-live-base.ks -sed -i "s/\(^.*stop.*atd\..*:\)/\1\nmodprobe dummy/g" ./kickstart/ovirt-live-base.ks +sed -i 's/firewall \-\-enabled/firewall \-\-disabled/g' kickstart/ovirt-live-base.ks +sed -i 's/livedir\=\"LiveOS\"/livedir\=\"LiveoVirt\"/g' kickstart/ovirt-live-base.ks +sed -i "s/\(^.*stop.*atd\..*:\)/\1\nmodprobe dummy/g" kickstart/ovirt-live-base.ks wget -N http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/TinyCore-current.iso wget -N http://download.fedoraproject.org/pub/fedora/linux/releases/18/Live/x86_64/Fedora-18-x86_64-Live-Desktop.iso -mkdir ./oVirtLiveFiles/rpms/ -mkdir ./oVirtLiveFiles/iso/ -mv -f *.rpm ./oVirtLiveFiles/rpms/ -mv -f *.iso ./oVirtLiveFiles/iso/ -livecd-creator -d -v --config=kickstart/ovirt.ks --cache=/home --fslabel=ovirt-live-`cat VERSION` > iso.log 2>&1 || notify-send "Error" + +if [ ! -d oVirtLiveFiles/rpms ]; then + mkdir oVirtLiveFiles/rpms +fi + +if [ ! -d oVirtLiveFiles/iso ]; then + oVirtLiveFiles/iso +fi + +mv -f *.rpm oVirtLiveFiles/rpms +mv -f *.iso oVirtLiveFiles/iso +livecd-creator -d -v --config=kickstart/ovirt.ks --cache=/home --fslabel=ovirt-live-cat `VERSION` > iso.log 2>&1 || notify-send "Error" notify-send "Check ISO" -- To view, visit http://gerrit.ovirt.org/14342 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffb6b46b5e1b64f16e2e77b954dd7c2251298d46 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Kiril Nesenko <knese...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
