mkinitrd(8): Move the defaults to /etc/defaults/mkinitrd.conf.

Provide this file by default and if the user has to change anything,
they can use /etc/mkinitrd.conf, just like for rc.conf, etc.

While here, change -e to -r for the test of /etc/mkinitrd.conf's
existence.

diff --git a/etc/Makefile b/etc/Makefile
index 2e817b1..20ef69e 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -54,7 +54,8 @@ DIRS+=        libexec/dma
 #
 BIN2=  pccard_ether rc.firewall rc.suspend rc.resume
 
-DEFAULTS= compilers.conf devfs.conf make.conf periodic.conf rc.conf uuids
+DEFAULTS= compilers.conf devfs.conf make.conf mkinitrd.conf periodic.conf \
+         rc.conf uuids
 
 MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
        BSD.var.dist

diff --git a/etc/defaults/mkinitrd.conf b/etc/defaults/mkinitrd.conf
new file mode 100644 (file)
index 0000000..6729369
--- /dev/null
+++ b/etc/defaults/mkinitrd.conf
@@ -0,0 +1,10 @@
+# Default configuration for mkinitrd(8)
+#
+BIN_TOOLS="mkdir rm sh kill"
+BOOT_DIR="/boot"
+CONTENT_DIRS="/usr/share/initrd"
+INITRD_DIRS="bin boot dev etc mnt proc sbin tmp var new_root"
+INITRD_SIZE="15m"
+SBIN_TOOLS="mount mount_devfs mount_hammer mount_nfs mount_null mount_procfs \
+       mount_tmpfs umount iscontrol cryptsetup lvm sysctl udevd tcplay"
+TMP_DIR="/tmp"

diff --git a/sbin/mkinitrd/mkinitrd.8 b/sbin/mkinitrd/mkinitrd.8
index 221575a..a5dca2f 100644 (file)
--- a/sbin/mkinitrd/mkinitrd.8
+++ b/sbin/mkinitrd/mkinitrd.8
@@ -28,7 +28,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 3, 2010
+.Dd December 12, 2011
 .Dt MKINITRD 8
 .Os
 .Sh NAME
@@ -71,12 +71,11 @@ option (the default is
 .Pp
 The
 .Nm
-script will check for
-.Pa /etc/defaults/mkinitrd.conf
-and
+script will read
 .Pa /etc/mkinitrd.conf
-and include the configuration from these files in the given order, allowing
-the user to override or add to the following variables:
+if it exists and use the configuration from this file to override the
+following variables (defaults are in
+.Pa /etc/defaults/mkinitrd.conf ) :
 .Bd -literal -offset indent
 BUILD_DIR
 INITRD_SIZE

diff --git a/sbin/mkinitrd/mkinitrd.sh b/sbin/mkinitrd/mkinitrd.sh
index d8342e5..14f6fe6 100644 (file)
--- a/sbin/mkinitrd/mkinitrd.sh
+++ b/sbin/mkinitrd/mkinitrd.sh
@@ -29,22 +29,11 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
+#
 
-TMP_DIR="/tmp"
-BOOT_DIR="/boot"
-INITRD_SIZE="15m"
-BIN_TOOLS="mkdir rm sh kill"
-SBIN_TOOLS="mount mount_devfs mount_hammer mount_nfs mount_null mount_procfs mount_tmpfs umount iscontrol cryptsetup lvm sysctl udevd tcplay"
-INITRD_DIRS="bin boot dev etc mnt proc sbin tmp var new_root"
-CONTENT_DIRS="/usr/share/initrd"
-
-if [ -e /etc/defaults/mkinitrd.conf ]; then
-       . /etc/defaults/mkinitrd.conf
-       echo "Loaded configuration from /etc/defaults/mkinitrd.conf"
-fi
-
+. /etc/defaults/mkinitrd.conf
 
-if [ -e /etc/mkinitrd.conf ]; then
+if [ -r /etc/mkinitrd.conf ]; then
        . /etc/mkinitrd.conf
        echo "Loaded configuration from /etc/mkinitrd.conf"
 fi