Date: Mon, 25 Apr 2016 20:56:39 GMT From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r301721 - in soc2015/kczekirda: master/cluster/node01/cluster mfsbsd mfsbsd/conf mfsbsd/scripts Message-ID: <201604252056.u3PKudOI031168@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kczekirda Date: Mon Apr 25 20:56:38 2016 New Revision: 301721 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=301721 Log: mfsbsd configuration Modified: soc2015/kczekirda/master/cluster/node01/cluster/run.sh soc2015/kczekirda/mfsbsd/Makefile soc2015/kczekirda/mfsbsd/conf/loader.conf.sample soc2015/kczekirda/mfsbsd/conf/rc.conf.sample soc2015/kczekirda/mfsbsd/conf/rc.local.sample soc2015/kczekirda/mfsbsd/scripts/mdinit Modified: soc2015/kczekirda/master/cluster/node01/cluster/run.sh ============================================================================== --- soc2015/kczekirda/master/cluster/node01/cluster/run.sh Mon Apr 25 18:55:01 2016 (r301720) +++ soc2015/kczekirda/master/cluster/node01/cluster/run.sh Mon Apr 25 20:56:38 2016 (r301721) @@ -10,13 +10,13 @@ . /cluster/rev -mount -t nfs -o nolockd $nfs:/mnt/tank/freebsd/$revision /usr/src -mount -t nfs -o nolockd $nfs:/mnt/tank/freebsd/$(hostname)/usr/obj /usr/obj +#mount -t nfs -o nolockd $nfs:/mnt/tank/freebsd/$revision /usr/src +#mount -t nfs -o nolockd $nfs:/mnt/tank/freebsd/$(hostname)/usr/obj /usr/obj echo "make build start" >> /usr/src/log echo $(date) >> /usr/src/log -cd /usr/src +cd /cluster/usr/src$revision $curl http://$master/admin/change_node_status/$(hostname)/buildworld $curl http://$master/admin/change_task_status/$revision/buildworld make -j4 buildworld @@ -39,7 +39,7 @@ $curl http://$master/admin/change_node_status/$(hostname)/installation $curl http://$master/admin/change_task_status/$revision/installation -export BSDINSTALL_DISTDIR=/usr/src/release/ftp/ +export BSDINSTALL_DISTDIR=/cluster/usr/src$revision/release/ftp/ 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 Modified: soc2015/kczekirda/mfsbsd/Makefile ============================================================================== --- soc2015/kczekirda/mfsbsd/Makefile Mon Apr 25 18:55:01 2016 (r301720) +++ soc2015/kczekirda/mfsbsd/Makefile Mon Apr 25 20:56:38 2016 (r301721) @@ -13,7 +13,7 @@ KERNCONF?= GENERIC MFSROOT_FREE_INODES?=10% MFSROOT_FREE_BLOCKS?=10% -MFSROOT_MAXSIZE?=80m +MFSROOT_MAXSIZE?=120m # If you want to build your own kernel and make you own world, you need to set # -DCUSTOM or CUSTOM=1 @@ -387,6 +387,8 @@ .if !defined(ROOTHACK) ${_v}echo "/dev/md0 / ufs rw 0 0" > ${_DESTDIR}/etc/fstab ${_v}echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" >> ${_DESTDIR}/etc/fstab + ${_v}echo "tmpfs /var tmpfs rw,mode=1755 0 0" >> ${_DESTDIR}/etc/fstab + .else ${_v}${TOUCH} ${_DESTDIR}/etc/fstab .endif Modified: soc2015/kczekirda/mfsbsd/conf/loader.conf.sample ============================================================================== --- soc2015/kczekirda/mfsbsd/conf/loader.conf.sample Mon Apr 25 18:55:01 2016 (r301720) +++ soc2015/kczekirda/mfsbsd/conf/loader.conf.sample Mon Apr 25 20:56:38 2016 (r301721) @@ -8,7 +8,7 @@ #mfsbsd.autodhcp="YES" # # Define a new root password -#mfsbsd.rootpw="foobar" +mfsbsd.rootpw="mfsroot" # # Alternatively define a root password hash like in master.passwd # NOTICE: replace '$' characters with '%' @@ -52,3 +52,4 @@ ahci_load="YES" vfs.root.mountfrom="ufs:/dev/md0" mfsbsd.autodhcp="YES" +autoboot_delay="3" Modified: soc2015/kczekirda/mfsbsd/conf/rc.conf.sample ============================================================================== --- soc2015/kczekirda/mfsbsd/conf/rc.conf.sample Mon Apr 25 18:55:01 2016 (r301720) +++ soc2015/kczekirda/mfsbsd/conf/rc.conf.sample Mon Apr 25 20:56:38 2016 (r301721) @@ -7,7 +7,7 @@ # see the interfaces.conf file in this directory. # # Set this to any desired hostname -hostname="mfsbsd" +#hostname="mfsbsd" # # You need a gateway defined for a working network setup #defaultrouter="192.168.0.254" @@ -23,3 +23,7 @@ cron_enable="NO" local_enable="YES" ntpd_enable="YES" +nfs_client_enable="YES" +nfsuserd_enable="YES" +nfscbd_enable="YES" + Modified: soc2015/kczekirda/mfsbsd/conf/rc.local.sample ============================================================================== --- soc2015/kczekirda/mfsbsd/conf/rc.local.sample Mon Apr 25 18:55:01 2016 (r301720) +++ soc2015/kczekirda/mfsbsd/conf/rc.local.sample Mon Apr 25 20:56:38 2016 (r301721) @@ -3,5 +3,5 @@ sleep 10 mkdir /cluster -mount -t nfs -o nolockd 192.168.22.19:/cluster/$(hostname)/cluster /cluster -sh -x /cluster/run.sh > /cluster/run.log 2>&1 & +mount -t nfs -o nolockd 192.168.22.19:/cluster /cluster +sh -x /cluster/run.sh > /cluster/log/$(hostname).log 2>&1 & Modified: soc2015/kczekirda/mfsbsd/scripts/mdinit ============================================================================== --- soc2015/kczekirda/mfsbsd/scripts/mdinit Mon Apr 25 18:55:01 2016 (r301720) +++ soc2015/kczekirda/mfsbsd/scripts/mdinit Mon Apr 25 20:56:38 2016 (r301721) @@ -24,9 +24,9 @@ /sbin/mount -t tmpfs tmpfs /usr /rescue/gzip -d -c /.usr.tar.gz | /rescue/tar -x -C / -f - fi - /sbin/mount -t tmpfs tmpfs /var/db/pkg - mkdir -p /var/cache/pkg - /sbin/mount -t tmpfs tmpfs /var/cache/pkg + #/sbin/mount -t tmpfs tmpfs /var/db/pkg + #mkdir -p /var/cache/pkg + #/sbin/mount -t tmpfs tmpfs /var/cache/pkg } load_rc_config $name
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604252056.u3PKudOI031168>