summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-04-13 21:27:08 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-04-13 21:27:08 +0000
commita98dfbdd1a8220e013cb9489965cc9aee8838740 (patch)
tree92fafeae934378a6b07bdbb0185718ee00fc6877
parentbad4cf240d1863775b8d39b524a2a9251edbf226 (diff)
pwd_mkdb now fits onto the install media. no more chroot games.
Diffstat
-rw-r--r--distrib/alpha/common/list3
-rw-r--r--distrib/amd64/common/list3
-rw-r--r--distrib/armish/ramdisk/list3
-rw-r--r--distrib/armv7/ramdisk/list3
-rw-r--r--distrib/aviion/ramdisk/list3
-rw-r--r--distrib/hppa/list3
-rw-r--r--distrib/i386/common/list3
-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/miniroot/install.sh4
-rw-r--r--distrib/miniroot/list3
-rw-r--r--distrib/octeon/ramdisk/list3
-rw-r--r--distrib/ramdisk/list3
-rw-r--r--distrib/sgi/ramdisk/list3
-rw-r--r--distrib/socppc/ramdisk/list3
-rw-r--r--distrib/sparc64/bsd.rd/list3
-rw-r--r--distrib/sparc64/ramdisk/list3
-rw-r--r--distrib/sparc64/ramdiskB/list3
-rw-r--r--distrib/special/Makefile4
-rw-r--r--distrib/special/pwd_mkdb/Makefile10
-rw-r--r--distrib/vax/common/list3
-rw-r--r--distrib/zaurus/ramdisk/list3
24 files changed, 56 insertions, 25 deletions
diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index d1e168d4616..87a22dad44a 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.44 2015/04/02 16:13:20 deraadt Exp $
+# $OpenBSD: list,v 1.45 2015/04/13 21:27:05 deraadt Exp $
SRCDIRS distrib/special
@@ -48,6 +48,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index a804219a873..a460057906a 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.38 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.39 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/installboot
# copy the MAKEDEV script and make some devices
diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list
index aafd19ff383..0d3c16858f0 100644
--- a/distrib/armish/ramdisk/list
+++ b/distrib/armish/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.29 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.30 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -60,6 +60,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 869a1a64f86..f95904f8259 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.16 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.17 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -61,6 +61,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/mkuboot
# this is the list from distrib/miniroot/makeconf.awk with -lz added.
diff --git a/distrib/aviion/ramdisk/list b/distrib/aviion/ramdisk/list
index 6370c1066c6..ded15c24a82 100644
--- a/distrib/aviion/ramdisk/list
+++ b/distrib/aviion/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.15 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.16 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/hppa/list b/distrib/hppa/list
index 45ba22f9085..68fe95c60bd 100644
--- a/distrib/hppa/list
+++ b/distrib/hppa/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.34 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.35 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/installboot
# various files that we need in /etc for the install
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 2fcc75f2363..7b6393359e8 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.41 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.42 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/installboot
# copy the MAKEDEV script and make some devices
diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index 2785b7f86b7..a1b0b796d9c 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.37 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.38 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -59,6 +59,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# firmware we might need
COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue
diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index 1a617d99543..112da6ba9cb 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.23 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.24 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -61,6 +61,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index 2fed67fa2fd..e40bc0c89fb 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.31 2015/04/02 16:13:24 deraadt Exp $
+# $OpenBSD: list,v 1.32 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index be0002657e8..169949c3567 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.59 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.60 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -60,6 +60,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 5123f69441d..1a883ffa5bb 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.264 2015/04/07 09:59:38 rpe Exp $
+# $OpenBSD: install.sh,v 1.265 2015/04/13 21:27:07 deraadt Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
@@ -359,7 +359,7 @@ if [[ -n "$_rootpass" ]]; then
w
q" | ed /mnt/etc/master.passwd 2>/dev/null
fi
-/mnt/usr/sbin/pwd_mkdb -p -d /mnt/etc /etc/master.passwd
+pwd_mkdb -p -d /mnt/etc /etc/master.passwd
# During autoinstall, add root user's public ssh key to authorized_keys.
[[ -n "$rootkey" ]] && (
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index 9e3e9adfac7..92a682237c3 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.64 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.65 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index 8768aa3d0ff..39b214b2b3e 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.15 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.16 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -58,6 +58,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index 58f5dca6232..cb7b905bad3 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.54 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.55 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -54,6 +54,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index fbf97f5586d..94e50c35a5e 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.48 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.49 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -56,6 +56,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index cafdfdd3e2a..c4e3a7daf70 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.29 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.30 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -58,6 +58,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index b681d3f25e4..dd1db6b1115 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.55 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.56 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -57,6 +57,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/installboot
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 8e85928018a..5968628dd0f 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.51 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.52 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -52,6 +52,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/installboot
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index cafdbda22a9..89a5467adbf 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.44 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.45 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -51,6 +51,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/installboot
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/special/Makefile b/distrib/special/Makefile
index 832a32f45a8..71c61a285ee 100644
--- a/distrib/special/Makefile
+++ b/distrib/special/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: Makefile,v 1.39 2015/04/13 21:27:07 deraadt Exp $
SUBDIR= libstubs \
arch bioctl cat chmod chroot cp date dd df dhclient disklabel dmesg \
@@ -6,7 +6,7 @@ SUBDIR= libstubs \
grep 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 ping6 reboot restore rm route sed \
+ newfs_msdos pax pdisk ping ping6 pwd_mkdb reboot restore rm route sed \
signify sleep stty sync sysctl umount ztsscale
install:
diff --git a/distrib/special/pwd_mkdb/Makefile b/distrib/special/pwd_mkdb/Makefile
new file mode 100644
index 00000000000..243adcd229a
--- /dev/null
+++ b/distrib/special/pwd_mkdb/Makefile
@@ -0,0 +1,10 @@
+# $OpenBSD: Makefile,v 1.1 2015/04/13 21:27:07 deraadt Exp $
+
+# static because it's used by the boot floppy through a chroot.
+
+PROG= pwd_mkdb
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
+
+.PATH: ${.CURDIR}/../../../usr.sbin/pwd_mkdb
+.include <bsd.prog.mk>
diff --git a/distrib/vax/common/list b/distrib/vax/common/list
index 1ff7ffdfe47..976caa37a2a 100644
--- a/distrib/vax/common/list
+++ b/distrib/vax/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.39 2015/04/02 20:51:04 deraadt Exp $
+# $OpenBSD: list,v 1.40 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS sys/arch/vax/stand
@@ -54,6 +54,7 @@ LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
#LINK instbin usr/sbin/bad144
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
# copy the MAKEDEV script and make some devices
COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list
index 1f4de31ea37..4714718d0a8 100644
--- a/distrib/zaurus/ramdisk/list
+++ b/distrib/zaurus/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.33 2015/04/02 16:13:25 deraadt Exp $
+# $OpenBSD: list,v 1.34 2015/04/13 21:27:07 deraadt Exp $
SRCDIRS distrib/special
@@ -60,6 +60,7 @@ LINK instbin usr/bin/more usr/bin/less
LINK instbin usr/bin/sed
LINK instbin usr/bin/signify
LINK instbin usr/sbin/chroot
+LINK instbin usr/sbin/pwd_mkdb
LINK instbin usr/sbin/ztsscale
# copy the MAKEDEV script and make some devices
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 00:55:26 +0000