summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2003-01-03 18:36:09 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2003-01-03 18:36:09 +0000
commita7935b98dff112aeea8aa755bfd26765722ff58c (patch)
tree1a7f298dcd3af62f360cd1de371777a3f7c3c683
parentc26db96c38cc00d2b548ce64eaa7c9db1ac288eb (diff)
Save a few more bytes on install media by stripping comments from
dhclient-script and disktab files in architectures where this wasn't already being done. OK deraadt@.
-rw-r--r--distrib/i386/common/list8
-rw-r--r--distrib/macppc/ramdisk/list6
-rw-r--r--distrib/mvme88k/miniroot/list4
-rw-r--r--distrib/mvmeppc/ramdisk/list6
-rw-r--r--distrib/ramdisk/list10
-rw-r--r--distrib/sparc/miniroot/list4
-rw-r--r--distrib/sparc/ramdisk/list4
-rw-r--r--distrib/sparc64/bsd.rd/list10
8 files changed, 26 insertions, 26 deletions
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 2df308b0da8..8f7092c162f 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.7 2002/05/01 19:21:28 mickey Exp $
+# $OpenBSD: list,v 1.8 2003/01/03 18:36:08 krw Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -64,7 +64,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+SCRIPT ${DESTDIR}/etc/disktab etc/disktab.shadow
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
TERMCAP vt100,vt220,dumb usr/share/misc/termcap
@@ -75,7 +75,7 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
SYMLINK /tmp/hosts etc/hosts
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
@@ -83,4 +83,4 @@ SCRIPT ${CURDIR}/../common/install.md install.md
SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
SCRIPT ${CURDIR}/../../miniroot/install.sh install
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
-SPECIAL chmod 755 install upgrade
+SPECIAL chmod 755 install upgrade sbin/dhclient-script
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index ace29df60b9..9117ff2574a 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.17 2002/05/01 19:21:28 mickey Exp $
+# $OpenBSD: list,v 1.18 2003/01/03 18:36:08 krw Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -74,7 +74,7 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt220,dumb usr/share/misc/termcap
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
@@ -82,4 +82,4 @@ SCRIPT ${CURDIR}/install.md install.md
SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
SCRIPT ${CURDIR}/../../miniroot/install.sh install
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
-SPECIAL chmod 755 install upgrade
+SPECIAL chmod 755 install upgrade sbin/dhclient-script
diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index 729a861c689..03a8aa16747 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.12 2002/05/01 19:21:28 mickey Exp $
+# $OpenBSD: list,v 1.13 2003/01/03 18:36:08 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Amiga extra's
@@ -19,7 +19,7 @@ SPECIAL cd dev; sh MAKEDEV all
COPY bsd bsd
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+SCRIPT ${DESTDIR}/etc/disktab etc/disktab.shadow
SYMLINK /tmp/disktab.shadow etc/disktab
SYMLINK /tmp/fstab.shadow etc/fstab
SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
diff --git a/distrib/mvmeppc/ramdisk/list b/distrib/mvmeppc/ramdisk/list
index 834ee54d5a4..bfaa840c2f7 100644
--- a/distrib/mvmeppc/ramdisk/list
+++ b/distrib/mvmeppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.12 2002/05/01 19:21:28 mickey Exp $
+# $OpenBSD: list,v 1.13 2003/01/03 18:36:08 krw Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -74,7 +74,7 @@ SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt220,dumb usr/share/misc/termcap
# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
# and the installation tools
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
@@ -82,4 +82,4 @@ SCRIPT ${CURDIR}/install.md install.md
SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
SCRIPT ${CURDIR}/../../miniroot/install.sh install
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
-SPECIAL chmod 755 install upgrade
+SPECIAL chmod 755 install upgrade sbin/dhclient-script
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index f8ea42a9137..4b6ffd2eb61 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.21 2002/04/30 01:31:20 deraadt Exp $
+# $OpenBSD: list,v 1.22 2003/01/03 18:36:08 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -52,12 +52,12 @@ COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${CURDIR}/../miniroot/protocols etc/protocols
COPY ${CURDIR}/../miniroot/services etc/services
+# dhcp things
+SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+
# and the installation scripts
SCRIPT ${CURDIR}/../miniroot/dot.profile .profile
SCRIPT ${CURDIR}/../miniroot/upgrade.sh upgrade
SCRIPT ${CURDIR}/../miniroot/install.sh install
SCRIPT ${CURDIR}/../miniroot/install.sub install.sub
-SPECIAL chmod 755 install upgrade
-
-# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+SPECIAL chmod 755 install upgrade sbin/dhclient-script
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index 3f146ae056a..9f0c0d02553 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.23 2002/08/29 01:53:37 krw Exp $
+# $OpenBSD: list,v 1.24 2003/01/03 18:36:08 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
@@ -26,7 +26,7 @@ SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot
COPY bsd bsd
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+SCRIPT ${DESTDIR}/etc/disktab etc/disktab.shadow
SYMLINK /tmp/disktab.shadow etc/disktab
SYMLINK /tmp/fstab.shadow etc/fstab
SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 7154e444317..066e815e861 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.19 2002/08/29 01:53:37 krw Exp $
+# $OpenBSD: list,v 1.20 2003/01/03 18:36:08 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
@@ -21,7 +21,7 @@ COPYDIR ${DESTDIR}/usr/mdec usr/mdec
SPECIAL rm -f usr/mdec/binstall usr/mdec/installboot
# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+SCRIPT ${DESTDIR}/etc/disktab etc/disktab.shadow
SYMLINK /tmp/disktab.shadow etc/disktab
SYMLINK /tmp/fstab.shadow etc/fstab
SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index aac9f7bd693..7f49d1fefc5 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.15 2002/07/28 03:33:28 krw Exp $
+# $OpenBSD: list,v 1.16 2003/01/03 18:36:08 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -63,13 +63,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
SYMLINK /tmp/hosts etc/hosts
TERMCAP vt100,vt220,dumb,sun usr/share/misc/termcap
+# dhcp things
+SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+
# and the installation scripts
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
SCRIPT ${CURDIR}/../common/install.md install.md
SCRIPT ${CURDIR}/../../miniroot/install.sh install
SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
-SPECIAL chmod 755 install upgrade
-
-# dhcp things
-COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
+SPECIAL chmod 755 install upgrade sbin/dhclient-script