yaifo Makefile,1.25,1.26 config,1.6,1.7 dot.profile,1.3,1.4 install.sh,1.10,1.11 install.sub,1.13,1.14 net.sh,1.9,1.10

Update of /cvsroot/yaifo/yaifo
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10465

Modified Files:
        Makefile config dot.profile install.sh install.sub net.sh
Log Message:
Add `make install` target inspired by OpenBSD's kernel install target.
Add SNAPSHOTS=no (or yes) to the config file to use the snapshots FTP
directory.

Index: install.sub
===================================================================
RCS file: /cvsroot/yaifo/yaifo/install.sub,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- install.sub 24 Feb 2009 23:16:18 -0000 1.13
+++ install.sub 9 Mar 2009 04:52:47 -0000 1.14
@@ -1648,6 +1648,7 @@
 
 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))"
 SETDIR="$VNAME/$ARCH"
+[ "${SNAPSHOT}" = "yes" -o ${SNAPSHOT} = "YES" ] && SETDIR="snapshots/$ARCH"
 FTPDIR="pub/OpenBSD/$VNAME"
 FTPOPTS="-V"
 OBSD="OpenBSD/$ARCH $VNAME"

Index: Makefile
===================================================================
RCS file: /cvsroot/yaifo/yaifo/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile 8 Mar 2009 21:31:29 -0000 1.25
+++ Makefile 9 Mar 2009 04:52:47 -0000 1.26
@@ -102,6 +102,25 @@
         @echo "successfully created yaifo.rd and yaifo.fs."
 .endif
 
+REALLY?= NO
+KERNEL?= /bsd
+install:
+.if ${REALLY} != "YES"
+ @echo "You aren't REALLY sure you want to install YAIFO over your kernel."
+ @echo "If you were, you would run: REALLY=YES make install"
+ @exit 1
+.else
+ @if [ -f /etc/boot.conf ]; then \
+ KERNEL=`awk '/^set image/ { printf "/%s",$$3 }' /etc/boot.conf`; \
+ fi; \
+ echo "Installing yaifo.rd ${KERNEL}..."; \
+ ${SUDO} rm -f /obsd && \
+ ${SUDO} ln ${KERNEL} /obsd && \
+ ${SUDO} cp ${TOP}/yaifo.rd /nbsd && \
+ ${SUDO} mv /nbsd ${KERNEL} && \
+ sync && sync
+.endif
+
 ${FS}: bsd.gz
 .if ${MACHINE} != "macppc"
         dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}

Index: install.sh
===================================================================
RCS file: /cvsroot/yaifo/yaifo/install.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- install.sh 22 Feb 2009 18:58:35 -0000 1.10
+++ install.sh 9 Mar 2009 04:52:47 -0000 1.11
@@ -66,6 +66,9 @@
 # install.sub needs to know the MODE
 MODE=install
 
+# include the yaifo configuration
+. /config
+
 # include common subroutines and initialization code
 . install.sub
 

Index: dot.profile
===================================================================
RCS file: /cvsroot/yaifo/yaifo/dot.profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dot.profile 3 Nov 2008 21:05:21 -0000 1.3
+++ dot.profile 9 Mar 2009 04:52:47 -0000 1.4
@@ -47,6 +47,7 @@
 
         if [ ! -n "${SSH_CLIENT}" ]; then
 
+ . /config
                 . /net
 
                 start_net

Index: net.sh
===================================================================
RCS file: /cvsroot/yaifo/yaifo/net.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- net.sh 20 Feb 2009 16:43:19 -0000 1.9
+++ net.sh 9 Mar 2009 04:52:47 -0000 1.10
@@ -23,8 +23,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-. /config
-
 get_ifdev() {
         ifconfig -a \
             | egrep -v '^[[:space:]]|(bridge|enc|gif|gre|lo|pflog|pfsync|ppp|sl|tun|vlan)[[:digit:]]+:' \

Index: config
===================================================================
RCS file: /cvsroot/yaifo/yaifo/config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config 20 Feb 2009 16:43:19 -0000 1.6
+++ config 9 Mar 2009 04:52:47 -0000 1.7
@@ -27,6 +27,9 @@
 # only remote is implemented
 TYPE=remote
 
+# SNAPSHOT yes/no
+SNAPSHOT=no
+
 # specific network device, automatic detection works only with
 # machines with a single network card
 DEVICE=

--
List Info:      http://erdelynet.com/yaifo-changes-list/
List Archives:  http://erdelynet.com/archive/yaifo-changes-l/
To Unsubscribe: Mail mailto:yaifo-changes+unsubscribe@erdelynet.com