summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjob <job@openbsd.org>2017-11-19 12:11:53 +0000
committerjob <job@openbsd.org>2017-11-19 12:11:53 +0000
commit14c88d5962113df934c627239a44bbc58169d345 (patch)
tree0da0d08d0a6e72d5e6ca9213ec00700f585655d1
parentExtend regulator "framework" with functions to get/set voltages. (diff)
downloadwireguard-openbsd-14c88d5962113df934c627239a44bbc58169d345.tar.xz
wireguard-openbsd-14c88d5962113df934c627239a44bbc58169d345.zip
add growfs(8) to ramdisk
Some resizing scenarios can be done from within single user mode, but resizing the root partition required you to bring your own growfs(8) binary into the ramdisk environment. This commit adds growfs(8) to the ramdisks (the ones that don't have space constraints) to simplify such operations. OK deraadt@
Diffstat
-rw-r--r--distrib/alpha/bsd.rd/list.local1
-rw-r--r--distrib/amd64/ramdisk_cd/list.local3
-rw-r--r--distrib/arm64/ramdisk/list3
-rw-r--r--distrib/armv7/ramdisk/list3
-rw-r--r--distrib/hppa/ramdisk/list.local3
-rw-r--r--distrib/i386/ramdisk_cd/list.local3
-rw-r--r--distrib/landisk/ramdisk/list3
-rw-r--r--distrib/loongson/ramdisk/list3
-rw-r--r--distrib/luna88k/ramdisk/list3
-rw-r--r--distrib/macppc/ramdisk/list3
-rw-r--r--distrib/octeon/ramdisk/list3
-rw-r--r--distrib/sgi/ramdisk/list3
-rw-r--r--distrib/socppc/ramdisk/list3
-rw-r--r--distrib/sparc64/ramdisk/list3
-rw-r--r--distrib/special/Makefile6
-rw-r--r--distrib/special/growfs/Makefile10
16 files changed, 40 insertions, 16 deletions
diff --git a/distrib/alpha/bsd.rd/list.local b/distrib/alpha/bsd.rd/list.local
index 4d2d3f1875b..c8d52363fe5 100644
--- a/distrib/alpha/bsd.rd/list.local
+++ b/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 a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local
index 49d677cb6d5..ced3f28ed94 100644
--- a/distrib/amd64/ramdisk_cd/list.local
+++ b/distrib/amd64/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.29 2017/07/08 15:42:46 florian Exp $
+# $OpenBSD: list.local,v 1.30 2017/11/19 12:11:53 job Exp $
# add local links; use bin/sh since instbin has already been unlinked
LINK instbin sbin/dhclient
@@ -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 a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list
index d1b4f696646..f82cdc0668c 100644
--- a/distrib/arm64/ramdisk/list
+++ b/distrib/arm64/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 2017/08/22 23:20:00 jsg Exp $
+# $OpenBSD: list,v 1.6 2017/11/19 12:11:53 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index dd2b1ddc618..2099007bb10 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.32 2017/09/15 16:34:25 jsg Exp $
+# $OpenBSD: list,v 1.33 2017/11/19 12:11:53 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/hppa/ramdisk/list.local b/distrib/hppa/ramdisk/list.local
index d2130f3bbde..2d76427beb8 100644
--- a/distrib/hppa/ramdisk/list.local
+++ b/distrib/hppa/ramdisk/list.local
@@ -1,10 +1,11 @@
-# $OpenBSD: list.local,v 1.5 2017/07/08 15:42:46 florian Exp $
+# $OpenBSD: list.local,v 1.6 2017/11/19 12:11:53 job Exp $
# hppa extra's
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 a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local
index 38879e31040..7ef8f65b7d9 100644
--- a/distrib/i386/ramdisk_cd/list.local
+++ b/distrib/i386/ramdisk_cd/list.local
@@ -1,6 +1,7 @@
-# $OpenBSD: list.local,v 1.38 2017/07/08 15:42:46 florian Exp $
+# $OpenBSD: list.local,v 1.39 2017/11/19 12:11:53 job 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 a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index 0aa2b9109d8..0666c202020 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.45 2017/07/08 15:42:46 florian Exp $
+# $OpenBSD: list,v 1.46 2017/11/19 12:11:53 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index 55250262771..d2da5605e13 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.30 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.31 2017/11/19 12:11:53 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index 984de10a4fc..2f8a8365a7d 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.38 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.39 2017/11/19 12:11:54 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 4c0c4d11800..fb8f39f9513 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.67 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.68 2017/11/19 12:11:54 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index 9a5a46101d7..c4bfe6d8794 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.22 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.23 2017/11/19 12:11:54 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index 82e655a7efa..e17a149678b 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.55 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.56 2017/11/19 12:11:54 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 5a23f578e09..15c440ec02b 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.36 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.37 2017/11/19 12:11:54 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 1b186e8e4fd..fb36bc9769c 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.58 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: list,v 1.59 2017/11/19 12:11:54 job Exp $
SRCDIRS distrib/special
@@ -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 a/distrib/special/Makefile b/distrib/special/Makefile
index c8a22ff7012..8349a7bfd32 100644
--- a/distrib/special/Makefile
+++ b/distrib/special/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2017/07/08 15:42:47 florian Exp $
+# $OpenBSD: Makefile,v 1.45 2017/11/19 12:11:54 job Exp $
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 a/distrib/special/growfs/Makefile b/distrib/special/growfs/Makefile
new file mode 100644
index 00000000000..7b09c9a3f8a
--- /dev/null
+++ b/distrib/special/growfs/Makefile
@@ -0,0 +1,10 @@
+# $OpenBSD: Makefile,v 1.1 2017/11/19 12:11:54 job Exp $
+
+PROG= growfs
+SRCS= growfs.c
+
+DPADD= ${LIBUTIL}
+LDADD= -lutil
+
+.PATH: ${.CURDIR}/../../../sbin/growfs
+.include <bsd.prog.mk>
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.