From owner-svn-soc-all@freebsd.org Fri Aug 21 18:52:02 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B38B9BF7DB for ; Fri, 21 Aug 2015 18:52:02 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A6F1C67 for ; Fri, 21 Aug 2015 18:52:02 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LIq2BV064170 for ; Fri, 21 Aug 2015 18:52:02 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7LIpx43064135 for svn-soc-all@FreeBSD.org; Fri, 21 Aug 2015 18:51:59 GMT (envelope-from kczekirda@FreeBSD.org) Date: Fri, 21 Aug 2015 18:51:59 GMT Message-Id: <201508211851.t7LIpx43064135@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r290046 - in soc2015/kczekirda/master/cluster: node01/cluster node02/cluster node03/cluster MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 18:52:02 -0000 Author: kczekirda Date: Fri Aug 21 18:51:59 2015 New Revision: 290046 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=290046 Log: bsdinstall condition Modified: soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input soc2015/kczekirda/master/cluster/node01/cluster/run.sh soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input soc2015/kczekirda/master/cluster/node02/cluster/run.sh soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input soc2015/kczekirda/master/cluster/node03/cluster/run.sh Modified: soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input ============================================================================== --- soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input Fri Aug 21 18:31:36 2015 (r290045) +++ soc2015/kczekirda/master/cluster/node01/cluster/bsdinstall.input Fri Aug 21 18:51:59 2015 (r290046) @@ -1,5 +1,14 @@ PARTITIONS=ada0 DISTRIBUTIONS="kernel.txz base.txz" +INTERFACE="bge0" +IPV4="yes" +DHCP="yes" #!/bin/sh -echo "Installation complete, running in host system" \ No newline at end of file +echo "Installation complete, running in host system" +pkg install curl +/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/hdd.ipxe +cat < /etc/rc.local +#!/bin/sh +/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/take_task.ipxe +EOF \ No newline at end of file Modified: soc2015/kczekirda/master/cluster/node01/cluster/run.sh ============================================================================== --- soc2015/kczekirda/master/cluster/node01/cluster/run.sh Fri Aug 21 18:31:36 2015 (r290045) +++ soc2015/kczekirda/master/cluster/node01/cluster/run.sh Fri Aug 21 18:51:59 2015 (r290046) @@ -40,9 +40,14 @@ $curl http://$master/admin/change_task_status/$revision/installation export BSDINSTALL_DISTDIR=/usr/src/release/ftp/ -bsdinstall script /cluster/bsdinstall.input - -$curl http://$master/admin/change_node_status/$(hostname)/rebooting -$curl http://$master/admin/change_task_status/$revision/done -$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe -# reboot +if bsdinstall script /cluster/bsdinstall.input; then + $curl http://$master/admin/change_node_status/$(hostname)/rebooting + $curl http://$master/admin/change_task_status/$revision/done + $curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe + reboot +else + $curl http://$master/admin/change_node_status/$(hostname)/rebooting + $curl http://$master/admin/change_task_status/$revision/failed + $curl http://$master/admin/change_boot/$(hostname)/take_task.ipxe + reboot +fi Modified: soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input ============================================================================== --- soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input Fri Aug 21 18:31:36 2015 (r290045) +++ soc2015/kczekirda/master/cluster/node02/cluster/bsdinstall.input Fri Aug 21 18:51:59 2015 (r290046) @@ -1,5 +1,14 @@ PARTITIONS=ada0 DISTRIBUTIONS="kernel.txz base.txz" +INTERFACE="bge0" +IPV4="yes" +DHCP="yes" #!/bin/sh -echo "Installation complete, running in host system" \ No newline at end of file +echo "Installation complete, running in host system" +pkg install curl +/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/hdd.ipxe +cat < /etc/rc.local +#!/bin/sh +/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/take_task.ipxe +EOF \ No newline at end of file Modified: soc2015/kczekirda/master/cluster/node02/cluster/run.sh ============================================================================== --- soc2015/kczekirda/master/cluster/node02/cluster/run.sh Fri Aug 21 18:31:36 2015 (r290045) +++ soc2015/kczekirda/master/cluster/node02/cluster/run.sh Fri Aug 21 18:51:59 2015 (r290046) @@ -40,9 +40,14 @@ $curl http://$master/admin/change_task_status/$revision/installation export BSDINSTALL_DISTDIR=/usr/src/release/ftp/ -bsdinstall script /cluster/bsdinstall.input - -$curl http://$master/admin/change_node_status/$(hostname)/rebooting -$curl http://$master/admin/change_task_status/$revision/done -$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe -# reboot +if bsdinstall script /cluster/bsdinstall.input; then + $curl http://$master/admin/change_node_status/$(hostname)/rebooting + $curl http://$master/admin/change_task_status/$revision/done + $curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe + reboot +else + $curl http://$master/admin/change_node_status/$(hostname)/rebooting + $curl http://$master/admin/change_task_status/$revision/failed + $curl http://$master/admin/change_boot/$(hostname)/take_task.ipxe + reboot +fi Modified: soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input ============================================================================== --- soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input Fri Aug 21 18:31:36 2015 (r290045) +++ soc2015/kczekirda/master/cluster/node03/cluster/bsdinstall.input Fri Aug 21 18:51:59 2015 (r290046) @@ -1,5 +1,14 @@ PARTITIONS=ada0 DISTRIBUTIONS="kernel.txz base.txz" +INTERFACE="bge0" +IPV4="yes" +DHCP="yes" #!/bin/sh -echo "Installation complete, running in host system" \ No newline at end of file +echo "Installation complete, running in host system" +pkg install curl +/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/hdd.ipxe +cat < /etc/rc.local +#!/bin/sh +/usr/local/bin/curl http://192.168.22.3:8080/admin/change_boot/$(hostname)/take_task.ipxe +EOF \ No newline at end of file Modified: soc2015/kczekirda/master/cluster/node03/cluster/run.sh ============================================================================== --- soc2015/kczekirda/master/cluster/node03/cluster/run.sh Fri Aug 21 18:31:36 2015 (r290045) +++ soc2015/kczekirda/master/cluster/node03/cluster/run.sh Fri Aug 21 18:51:59 2015 (r290046) @@ -40,9 +40,14 @@ $curl http://$master/admin/change_task_status/$revision/installation export BSDINSTALL_DISTDIR=/usr/src/release/ftp/ -bsdinstall script /cluster/bsdinstall.input - -$curl http://$master/admin/change_node_status/$(hostname)/rebooting -$curl http://$master/admin/change_task_status/$revision/done -$curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe -# reboot +if bsdinstall script /cluster/bsdinstall.input; then + $curl http://$master/admin/change_node_status/$(hostname)/rebooting + $curl http://$master/admin/change_task_status/$revision/done + $curl http://$master/admin/change_boot/$(hostname)/hdd.ipxe + reboot +else + $curl http://$master/admin/change_node_status/$(hostname)/rebooting + $curl http://$master/admin/change_task_status/$revision/failed + $curl http://$master/admin/change_boot/$(hostname)/take_task.ipxe + reboot +fi