On Tue, Nov 07, 2017 at 06:15:09PM +0000, Job Snijders wrote:
> On Mon, Nov 06, 2017 at 04:14:48PM -0700, Theo de Raadt wrote:
> > I agree on that. So please put it into the correct lists files for
> > all the unlimited ramdisks.
> >
> > Job, the situation is a little nit-picky but try to do it for all the
> > architectures and I'll give you fast feedback.
>
> This is what I was able to test. The current state of affairs: growfs
> in bsd.rd will cost 16K on amd64 and 21K on i386.
>
> Filesystem Size Used Avail Capacity mounted on
> amd64 with growfs: /dev/rd0a 3.5M 3.1M 365K 90% /
> amd64 without growfs: /dev/rd0a 3.5M 3.1M 381K 89% /
> i386 with growfs: /dev/rd0a 3.0M 2.7M 294K 90% /
> i386 without growfs: /dev/rd0a 3.0M 2.7M 315K 90% /
>
> Below is the MI patch. I glanced at Florian's slaacd commit to figure
> out where the link lines should go.
This looks about right. For obvious reasons I can't OK it though...
>
> Kind regards,
>
> Job
>
> diff --git distrib/alpha/bsd.rd/list.local distrib/alpha/bsd.rd/list.local
> index 4d2d3f1875b..c8d52363fe5 100644
> --- distrib/alpha/bsd.rd/list.local
> +++ distrib/alpha/bsd.rd/list.local
> @@ -1,3 +1,4 @@
> +LINK instbin sbin/growfs
> LINK instbin sbin/mount_cd9660
> LINK instbin sbin/dhclient
> LINK instbin bin/mt bin/eject
> diff --git distrib/amd64/ramdisk_cd/list.local
> distrib/amd64/ramdisk_cd/list.local
> index 49d677cb6d5..094ead2f06a 100644
> --- distrib/amd64/ramdisk_cd/list.local
> +++ distrib/amd64/ramdisk_cd/list.local
> @@ -9,6 +9,7 @@ LINK instbin sbin/mount_msdos
> LINK instbin sbin/mount_udf
> LINK instbin sbin/newfs_msdos
> LINK instbin sbin/fsck_msdos
> +LINK instbin sbin/growfs
> LINK instbin sbin/slaacd
>
> COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem
> diff --git distrib/arm64/ramdisk/list distrib/arm64/ramdisk/list
> index d1b4f696646..3f3a2926aff 100644
> --- distrib/arm64/ramdisk/list
> +++ distrib/arm64/ramdisk/list
> @@ -35,6 +35,7 @@ LINK instbin
> sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ext2fs
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/armv7/ramdisk/list distrib/armv7/ramdisk/list
> index dd2b1ddc618..02b4800f226 100644
> --- distrib/armv7/ramdisk/list
> +++ distrib/armv7/ramdisk/list
> @@ -35,6 +35,7 @@ LINK instbin
> sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ext2fs
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/hppa/ramdisk/list.local distrib/hppa/ramdisk/list.local
> index d2130f3bbde..d4598cba7bf 100644
> --- distrib/hppa/ramdisk/list.local
> +++ distrib/hppa/ramdisk/list.local
> @@ -5,6 +5,7 @@ LINK instbin sbin/disklabel
> LINK instbin usr/bin/grep usr/bin/egrep
> usr/bin/fgrep
> LINK instbin usr/bin/more usr/bin/less
> LINK instbin sbin/bioctl
> +LINK instbin sbin/growfs
> LINK instbin sbin/slaacd
>
> # copy the MAKEDEV script and make some devices
> diff --git distrib/i386/ramdisk_cd/list.local
> distrib/i386/ramdisk_cd/list.local
> index 38879e31040..eed3304bb06 100644
> --- distrib/i386/ramdisk_cd/list.local
> +++ distrib/i386/ramdisk_cd/list.local
> @@ -1,6 +1,7 @@
> # $OpenBSD: list.local,v 1.38 2017/07/08 15:42:46 florian Exp $
>
> # add local links; use bin/sh since instbin has already been unlinked
> +LINK instbin sbin/growfs
> LINK instbin sbin/mount_ext2fs
> LINK instbin sbin/mount_msdos
> LINK instbin sbin/mount_udf
> diff --git distrib/landisk/ramdisk/list distrib/landisk/ramdisk/list
> index 0aa2b9109d8..6295dd433dc 100644
> --- distrib/landisk/ramdisk/list
> +++ distrib/landisk/ramdisk/list
> @@ -34,6 +34,7 @@ LINK instbin
> sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ext2fs
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/loongson/ramdisk/list distrib/loongson/ramdisk/list
> index 55250262771..f71b771a234 100644
> --- distrib/loongson/ramdisk/list
> +++ distrib/loongson/ramdisk/list
> @@ -33,6 +33,7 @@ LINK instbin
> sbin/dmesg
> LINK instbin sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/kbd
> diff --git distrib/luna88k/ramdisk/list distrib/luna88k/ramdisk/list
> index 984de10a4fc..98305e1daee 100644
> --- distrib/luna88k/ramdisk/list
> +++ distrib/luna88k/ramdisk/list
> @@ -32,6 +32,7 @@ LINK instbin
> sbin/disklabel
> LINK instbin sbin/dmesg
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/macppc/ramdisk/list distrib/macppc/ramdisk/list
> index 4c0c4d11800..5c9430634aa 100644
> --- distrib/macppc/ramdisk/list
> +++ distrib/macppc/ramdisk/list
> @@ -34,6 +34,7 @@ LINK instbin
> sbin/dmesg
> LINK instbin sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/octeon/ramdisk/list distrib/octeon/ramdisk/list
> index 9a5a46101d7..7706a6aa969 100644
> --- distrib/octeon/ramdisk/list
> +++ distrib/octeon/ramdisk/list
> @@ -33,6 +33,7 @@ LINK instbin
> sbin/dmesg
> LINK instbin sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/sgi/ramdisk/list distrib/sgi/ramdisk/list
> index 82e655a7efa..a43ba493b1b 100644
> --- distrib/sgi/ramdisk/list
> +++ distrib/sgi/ramdisk/list
> @@ -33,6 +33,7 @@ LINK instbin
> sbin/disklabel
> LINK instbin sbin/dmesg
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/kbd
> diff --git distrib/socppc/ramdisk/list distrib/socppc/ramdisk/list
> index 5a23f578e09..933ad66313f 100644
> --- distrib/socppc/ramdisk/list
> +++ distrib/socppc/ramdisk/list
> @@ -33,6 +33,7 @@ LINK instbin
> sbin/dmesg
> LINK instbin sbin/fdisk
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/sparc64/ramdisk/list distrib/sparc64/ramdisk/list
> index 1b186e8e4fd..483a76917c5 100644
> --- distrib/sparc64/ramdisk/list
> +++ distrib/sparc64/ramdisk/list
> @@ -32,6 +32,7 @@ LINK instbin
> sbin/disklabel
> LINK instbin sbin/dmesg
> LINK instbin sbin/fsck
> LINK instbin sbin/fsck_ffs
> +LINK instbin sbin/growfs
> LINK instbin sbin/ifconfig
> LINK instbin sbin/init
> LINK instbin sbin/mknod
> diff --git distrib/special/Makefile distrib/special/Makefile
> index c8a22ff7012..bd465ff1fb6 100644
> --- distrib/special/Makefile
> +++ distrib/special/Makefile
> @@ -3,8 +3,8 @@
> SUBDIR= libstubs \
> arch bioctl cat chmod chroot cp date dd df dhclient disklabel dmesg \
> doas ed eeprom encrypt fdisk fsck fsck_ext2fs fsck_ffs fsck_msdos ftp \
> - ftp-ssl grep gzip hostname ifconfig init installboot kbd ksh ln ls md5 \
> - mkdir mknod mkuboot more mount mount_cd9660 mount_ext2fs \
> + ftp-ssl grep growfs gzip hostname ifconfig init installboot kbd ksh ln \
> + ls md5 mkdir mknod mkuboot more mount mount_cd9660 mount_ext2fs \
> mount_ffs mount_msdos mount_nfs mount_udf mt mv newfs newfs_ext2fs \
> newfs_msdos pax pdisk ping pwd_mkdb reboot restore rm route sed \
> signify slaacd sleep stty sync sysctl umount
> diff --git distrib/special/growfs/Makefile distrib/special/growfs/Makefile
> new file mode 100644
> index 00000000000..e872d157c79
> --- /dev/null
> +++ distrib/special/growfs/Makefile
> @@ -0,0 +1,10 @@
> +# $OpenBSD: Makefile,v 1.8 2015/11/23 18:35:18 mmcc Exp $
> +
> +PROG= growfs
> +SRCS= growfs.c
> +
> +DPADD= ${LIBUTIL}
> +LDADD= -lutil
> +
> +.PATH: ${.CURDIR}/../../../sbin/growfs
> +.include <bsd.prog.mk>
>
--
I'm not entirely sure you are real.
