diff options
| author |   jsing <jsing@openbsd.org> | 2008-02-18 16:08:26 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2008-02-18 16:08:26 +0000 |
| commit | 5c71dfdc40a2eb46b1a9b0686c16a1a449dae296 (patch) | |
| tree | 70af73b18120ffaa35d076346f3ff81950fe788f | |
| parent | Cleanup sgivol(8) and make it behave more appropriately. Remove the '-f' (diff) | |
| download | wireguard-openbsd-5c71dfdc40a2eb46b1a9b0686c16a1a449dae296.tar.xz wireguard-openbsd-5c71dfdc40a2eb46b1a9b0686c16a1a449dae296.zip | |
sgivol(8) no longer requires the '-f' option.
| -rw-r--r-- | distrib/sgi/cdfs/Makefile | 8 | ||||
| -rw-r--r-- | distrib/sgi/iso/Makefile | 8 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/install.md | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index 077348e6291..5086bcddece 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2005/08/01 19:58:13 kettenis Exp $ +# $OpenBSD: Makefile,v 1.5 2008/02/18 16:08:26 jsing Exp $ TOP= ${.CURDIR}/.. @@ -34,9 +34,9 @@ ${CDROM}: dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=10 vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} # would love to use -h 64, but boot is slightly too big - /usr/mdec/sgivol -f -i -h 88 svnd0 > ${.OBJDIR}/volhdr - /usr/mdec/sgivol -f -w boot ${.OBJDIR}/boot svnd0 - /usr/mdec/sgivol -f -l boot sashARCS svnd0 + /usr/mdec/sgivol -i -h 88 svnd0 > ${.OBJDIR}/volhdr + /usr/mdec/sgivol -w boot ${.OBJDIR}/boot svnd0 + /usr/mdec/sgivol -l boot sashARCS svnd0 vnconfig -u svnd0 dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \ seek=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'` diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index 8703f02de77..4f2505600e3 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2007/10/13 21:45:01 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2008/02/18 16:08:26 jsing Exp $ TOP= ${.CURDIR}/.. @@ -48,9 +48,9 @@ ${CDROM}: dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=10 vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} # would love to use -h 64, but boot is slightly too big - /usr/mdec/sgivol -f -i -h 88 svnd0 > ${.OBJDIR}/volhdr - /usr/mdec/sgivol -f -w boot ${.OBJDIR}/boot svnd0 - /usr/mdec/sgivol -f -l boot sashARCS svnd0 + /usr/mdec/sgivol -i -h 88 svnd0 > ${.OBJDIR}/volhdr + /usr/mdec/sgivol -w boot ${.OBJDIR}/boot svnd0 + /usr/mdec/sgivol -l boot sashARCS svnd0 vnconfig -u svnd0 dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \ seek=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'` diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index 46f912ee189..f78430b54ab 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.7 2006/03/17 09:22:43 otto Exp $ +# $OpenBSD: install.md,v 1.8 2008/02/18 16:08:26 jsing Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -137,7 +137,7 @@ __EOT esac echo "Installing boot loader in volume header." - /usr/mdec/sgivol -wf boot /usr/mdec/boot $_disk + /usr/mdec/sgivol -w boot /usr/mdec/boot $_disk case $? in 0) ;; |