initrd: /usr/share/initrd/sbin wasn't being created. Add it via mtree(8).

This led to oinit being installed as a file named 'sbin'. Remove this
file via etc/Makefile (during 'make upgrade') so that with the next
upgrade the file is installed correctly.

diff --git a/etc/Makefile b/etc/Makefile
index 9fb8f33..c51e3c9 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -135,7 +135,7 @@ preupgrade:
 
 upgrade_etc:   preupgrade remove-obsolete-files
        # files that should be dirs (not possible with Makefile_upgrade.inc)
-.for f in usr/include/dev/misc/ppi
+.for f in usr/include/dev/misc/ppi usr/share/initrd/sbin
        [ -d ${DESTDIR}/${f} ] || rm -f ${DESTDIR}/${f}
 .endfor
 .if !defined(BINARY_UPGRADE) # binary upgrade just copies these files

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 2867a45..b128b2f 100644 (file)
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -348,9 +348,11 @@
         info
         ..
         initrd
+            bin
+            ..
             etc
             ..
-            bin
+            sbin
             ..
         ..
         installer