summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2017-07-08 15:42:46 +0000
committerflorian <florian@openbsd.org>2017-07-08 15:42:46 +0000
commitf99f61a2543824b838174397efde3750d9d0ffe4 (patch)
treee1aa7027098df5260fb6f6048f221249092f896d
parent_slaacd user/group for installer (diff)
downloadwireguard-openbsd-f99f61a2543824b838174397efde3750d9d0ffe4.tar.xz
wireguard-openbsd-f99f61a2543824b838174397efde3750d9d0ffe4.zip
hook up slaacd to the installer on media where we have INET6
-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/Makefile4
15 files changed, 29 insertions, 15 deletions
diff --git a/distrib/alpha/bsd.rd/list.local b/distrib/alpha/bsd.rd/list.local
index cdeaca66a0e..4d2d3f1875b 100644
--- a/distrib/alpha/bsd.rd/list.local
+++ b/distrib/alpha/bsd.rd/list.local
@@ -2,6 +2,7 @@ LINK instbin sbin/mount_cd9660
LINK instbin sbin/dhclient
LINK instbin bin/mt bin/eject
LINK instbin sbin/bioctl
+LINK instbin sbin/slaacd
# firmware we might need
#COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1
diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local
index ed6564e7033..49d677cb6d5 100644
--- a/distrib/amd64/ramdisk_cd/list.local
+++ b/distrib/amd64/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.28 2016/12/30 22:32:25 deraadt Exp $
+# $OpenBSD: list.local,v 1.29 2017/07/08 15:42:46 florian 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/slaacd
COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem
LINK instbin usr/bin/ftp-ssl usr/bin/ftp
diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list
index 8e2fc2039ee..98ccc970afc 100644
--- a/distrib/arm64/ramdisk/list
+++ b/distrib/arm64/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.3 2017/07/08 15:40:29 florian Exp $
+# $OpenBSD: list,v 1.4 2017/07/08 15:42:46 florian Exp $
SRCDIRS distrib/special
@@ -50,6 +50,7 @@ LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index a40302c9259..c5e0ad5b0d9 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.29 2017/07/08 15:40:29 florian Exp $
+# $OpenBSD: list,v 1.30 2017/07/08 15:42:46 florian Exp $
SRCDIRS distrib/special
@@ -50,6 +50,7 @@ LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/hppa/ramdisk/list.local b/distrib/hppa/ramdisk/list.local
index 2e6b4f0fe13..d2130f3bbde 100644
--- a/distrib/hppa/ramdisk/list.local
+++ b/distrib/hppa/ramdisk/list.local
@@ -1,10 +1,11 @@
-# $OpenBSD: list.local,v 1.4 2016/09/04 09:54:22 rpe Exp $
+# $OpenBSD: list.local,v 1.5 2017/07/08 15:42:46 florian 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/slaacd
# copy the MAKEDEV script and make some devices
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local
index afdb42f3fe6..38879e31040 100644
--- a/distrib/i386/ramdisk_cd/list.local
+++ b/distrib/i386/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.37 2016/12/30 22:32:25 deraadt Exp $
+# $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/mount_ext2fs
@@ -6,6 +6,7 @@ LINK instbin sbin/mount_msdos
LINK instbin sbin/mount_udf
LINK instbin sbin/restore
LINK instbin sbin/bioctl
+LINK instbin sbin/slaacd
COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem
LINK instbin usr/bin/ftp-ssl usr/bin/ftp
diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index b2b5ed4a92f..0aa2b9109d8 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.44 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.45 2017/07/08 15:42:46 florian Exp $
SRCDIRS distrib/special
@@ -48,6 +48,7 @@ LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index 9a42574fdf1..55250262771 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.29 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.30 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -50,6 +50,7 @@ LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index 22e8ca42bf0..984de10a4fc 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.37 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.38 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -43,6 +43,7 @@ LINK instbin sbin/newfs
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 80835ca1ade..4c0c4d11800 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.66 2016/12/30 22:34:20 deraadt Exp $
+# $OpenBSD: list,v 1.67 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -49,6 +49,7 @@ LINK instbin sbin/pdisk
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index e8754661691..9a5a46101d7 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.21 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.22 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -47,6 +47,7 @@ LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index c7bdb4b1de9..82e655a7efa 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.54 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.55 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -45,6 +45,7 @@ LINK instbin sbin/newfs
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 88a32331203..5a23f578e09 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.35 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.36 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -47,6 +47,7 @@ LINK instbin sbin/newfs_msdos
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 7206693b344..1b186e8e4fd 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.57 2016/09/17 15:03:39 florian Exp $
+# $OpenBSD: list,v 1.58 2017/07/08 15:42:47 florian Exp $
SRCDIRS distrib/special
@@ -41,6 +41,7 @@ LINK instbin sbin/newfs
LINK instbin sbin/ping sbin/ping6
LINK instbin sbin/reboot sbin/halt
LINK instbin sbin/route
+LINK instbin sbin/slaacd
LINK instbin sbin/sysctl
LINK instbin sbin/umount
LINK instbin usr/bin/doas
diff --git a/distrib/special/Makefile b/distrib/special/Makefile
index 76da4259760..c8a22ff7012 100644
--- a/distrib/special/Makefile
+++ b/distrib/special/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2016/12/30 22:26:57 deraadt Exp $
+# $OpenBSD: Makefile,v 1.44 2017/07/08 15:42:47 florian Exp $
SUBDIR= libstubs \
arch bioctl cat chmod chroot cp date dd df dhclient disklabel dmesg \
@@ -7,7 +7,7 @@ SUBDIR= libstubs \
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 sleep stty sync sysctl umount
+ signify slaacd sleep stty sync sysctl umount
install: