Page MenuHomeFreeBSD
Files F167677200

D59042.id184596.diff
No OneTemporary
Actions

D59042.id184596.diff
View Options

diff --git a/tools/tools/nanobsd/_xxx_includes.subr b/tools/tools/nanobsd/_xxx_includes.subr
--- a/tools/tools/nanobsd/_xxx_includes.subr
+++ b/tools/tools/nanobsd/_xxx_includes.subr
@@ -95,6 +95,54 @@
fi
}
+#
+# Manually run triggers and package scripts
+# XXX: Manually run scripts or just triggers?
+# Ideally the package plist should have an @generates keyword that adds
+# generated files to the metalog:
+#
+_xxx_run_pkg_scripts() {
+ # Repopulate the passwd db
+ if [ -f "${NANO_WORLDDIR}/etc/master.passwd" ]; then
+ pwd_mkdb -i -p -d "${NANO_WORLDDIR}/etc" \
+ "${NANO_WORLDDIR}/etc/master.passwd"
+ # Add the passwd db files to the metalog
+ metalog_add_data "./etc/login.conf.db"
+ metalog_add_data "./conf/base/etc/login.conf.db"
+ metalog_add_data "./etc/passwd"
+ metalog_add_data "./conf/base/etc/passwd"
+ metalog_add_data "./etc/pwd.db"
+ metalog_add_data "./conf/base/etc/pwd.db"
+ metalog_add_data "./etc/spwd.db" "0600"
+ metalog_add_data "./conf/base/etc/spwd.db" "0600"
+ fi
+ # Repopulate the capabilities db
+ if [ -f "${NANO_WORLDDIR}/etc/login.conf" ]; then
+ # XXX: Endianness
+ cap_mkdb "${NANO_WORLDDIR}/etc/login.conf"
+ # Add the capabilities db to the metalog
+ metalog_add_data "./etc/login.conf.db"
+ metalog_add_data "./conf/base/etc/login.conf.db"
+ fi
+ # Repopulate the services db
+ if [ -f "${NANO_WORLDDIR}/etc/services" ]; then
+ # XXX: Endianness
+ services_mkdb -q -o "${NANO_WORLDDIR}/var/db/services.db" \
+ "${NANO_WORLDDIR}/etc/services"
+ # Add the services db to the metalog
+ metalog_add_data "./var/db/services.db"
+ metalog_add_data "./conf/base/var/db/services.db"
+ fi
+ if [ -f "${NANO_WORLDDIR}/etc/ssl/cert.pem" ]; then
+ certctl -D "$NANO_WORLDDIR" -U -M "$NANO_METALOG" rehash
+ metalog_add_data "./etc/ssl/cert.pem" "0444"
+ metalog_add_data "./conf/base/etc/ssl/cert.pem" "0444"
+ fi
+
+ # Add /sys symlink, we do run make distribution in install_etc()
+ _xxx_add_sys_symlink
+}
+
#
# If we do "make distribution", this directory must be present.
# XXX: Discuss adding this as a pkg script in base

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 24, 5:30 PM (10 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37047187
Default Alt Text
D59042.id184596.diff (2 KB)

Event Timeline