Page MenuHomeFreeBSD
Files F169103132

D58976.id184527.diff
No OneTemporary
Actions

D58976.id184527.diff
View Options

diff --git a/tools/tools/nanobsd/gpt/Files.mtree b/tools/tools/nanobsd/defaults/Files.mtree
rename from tools/tools/nanobsd/gpt/Files.mtree
rename to tools/tools/nanobsd/defaults/Files.mtree
--- a/tools/tools/nanobsd/gpt/Files.mtree
+++ b/tools/tools/nanobsd/defaults/Files.mtree
@@ -1,8 +1,9 @@
#
# To generate this mtree file:
# cd tools/tools/nanobsd
-# mtree -c -p gpt/Files | mtree -C -k type,uname,gname,mode > gpt/Files.mtree
-# and update the desired ownerships and permissions
+# mtree -c -p defaults/Files |
+# mtree -C -k type,uname,gname,mode > defaults/Files.mtree
+# and update to the desired ownerships and permissions
#
. type=dir uname=root gname=wheel mode=0755
./usr type=dir uname=root gname=wheel mode=0755
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/change_password b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/change_password
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/change_password
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/change_password
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/rollback b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/rollback
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/rollback
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/rollback
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/save_cfg b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/save_cfg
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/save_cfg
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/save_cfg
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/save_sshkeys b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/save_sshkeys
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/save_sshkeys
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/save_sshkeys
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/update b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/update
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/update
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/update
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/updatep1 b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/updatep1
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/updatep1
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/updatep1
diff --git a/tools/tools/nanobsd/gpt/Files/usr/local/sbin/updatep2 b/tools/tools/nanobsd/defaults/Files/usr/local/sbin/updatep2
rename from tools/tools/nanobsd/gpt/Files/usr/local/sbin/updatep2
rename to tools/tools/nanobsd/defaults/Files/usr/local/sbin/updatep2
diff --git a/tools/tools/nanobsd/gpt.sh b/tools/tools/nanobsd/gpt.sh
--- a/tools/tools/nanobsd/gpt.sh
+++ b/tools/tools/nanobsd/gpt.sh
@@ -59,9 +59,6 @@
NANO_BOOTLOADER="boot/gptboot"
-NANO_CUST_FILESDIR="${NANO_TOOLS}/gpt/Files"
-NANO_CUST_FILES_MTREE="${NANO_TOOLS}/gpt/Files.mtree"
-
# Create the /etc/fstab file
tgt_write_fstab() {
(
diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh
--- a/tools/tools/nanobsd/legacy.sh
+++ b/tools/tools/nanobsd/legacy.sh
@@ -109,6 +109,17 @@
# Size of the /tmp+/var ramdisk in 512 bytes sectors
NANO_RAM_TMPVARSIZE=10240
+# Path to the files directory used by cust_install_files()
+NANO_CUST_FILESDIR="${NANO_TOOLS}/Files"
+
+#
+# Path to mtree file to apply to anything copied by cust_install_files().
+# If you specify this, the mtree file *must* have an entry for every file and
+# directory located in Files
+#
+NANO_CUST_FILES_MTREE=""
+
+
# Where cust_pkgng() finds packages to install
NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg
NANO_PACKAGE_LIST="*"

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 10:24 AM (6 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37805784
Default Alt Text
D58976.id184527.diff (3 KB)

Event Timeline