From 1c258cbf5b65adaba3ea3afff84dc443c8f2a19c Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 7 Jun 2019 14:39:58 +0000 Subject: eliminate differences between all the list files as much as possible, and remove the failed previous attempts at sharing in ./miniroot and ./ramdisk. maybe now that differences are eliminated we can start a new sharing effort? i dunno.. --- distrib/landisk/ramdisk/list | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'distrib/landisk') diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index 5347e314309..b7ddb8d6959 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.49 2019/06/02 14:58:44 deraadt Exp $ +# $OpenBSD: list,v 1.50 2019/06/07 14:39:57 deraadt Exp $ SRCDIRS distrib/special @@ -14,11 +14,9 @@ LINK instbin bin/df LINK instbin bin/ed LINK instbin bin/hostname LINK instbin bin/ksh bin/sh -ARGVLINK ksh -sh LINK instbin bin/ln LINK instbin bin/ls LINK instbin bin/md5 bin/sha256 bin/sha512 -SPECIAL rm bin/md5 LINK instbin bin/mkdir LINK instbin bin/mt bin/eject LINK instbin bin/mv @@ -62,8 +60,10 @@ LINK instbin usr/bin/sed LINK instbin usr/bin/signify LINK instbin usr/bin/tee LINK instbin usr/sbin/chroot -LINK instbin usr/sbin/pwd_mkdb LINK instbin usr/sbin/installboot +LINK instbin usr/sbin/pwd_mkdb +ARGVLINK ksh -sh +SPECIAL rm bin/md5 # firmware we might need COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue @@ -88,13 +88,13 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int +# for fdisk(8) +COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr + # copy the MAKEDEV script and make some devices SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk -# for fdisk(8) -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr - # various files that we need in /etc for the install COPY ${CURDIR}/../../miniroot/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd @@ -110,8 +110,8 @@ SYMLINK /tmp/i/hosts etc/hosts # and the installation tools SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile -SCRIPT ${CURDIR}/install.md install.md SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub +SCRIPT ${CURDIR}/install.md install.md SPECIAL chmod 755 install.sub SYMLINK install.sub autoinstall SYMLINK install.sub install -- cgit v1.2.3