Install default users directly
Install /home/ast and /home/bin as part of the system build procedure, as the setup script is not ran on the arm image. /home/bin is needed for successful completion of our test suite. This patch does not change the setup script, as it is not bothered by those files/directiories being already there, and may be useful during reinstallation on intel systems. Change-Id: I358c881df09223c343442673aa0822937f9ea33c
This commit is contained in:
parent
5180c3cfb9
commit
a212fd1ba5
3 changed files with 26 additions and 10 deletions
|
@ -107,6 +107,14 @@
|
||||||
./etc/ttys minix-sys
|
./etc/ttys minix-sys
|
||||||
./etc/utmp minix-sys
|
./etc/utmp minix-sys
|
||||||
./home minix-sys
|
./home minix-sys
|
||||||
|
./home/ast minix-sys
|
||||||
|
./home/ast/.ashrc minix-sys
|
||||||
|
./home/ast/.exrc minix-sys
|
||||||
|
./home/ast/.profile minix-sys
|
||||||
|
./home/bin minix-sys
|
||||||
|
./home/bin/.ashrc minix-sys
|
||||||
|
./home/bin/.exrc minix-sys
|
||||||
|
./home/bin/.profile minix-sys
|
||||||
./lib/cpp minix-sys
|
./lib/cpp minix-sys
|
||||||
./libexec/ld-elf.so.1 minix-sys
|
./libexec/ld-elf.so.1 minix-sys
|
||||||
./libexec/ld.elf_so minix-sys
|
./libexec/ld.elf_so minix-sys
|
||||||
|
|
18
etc/Makefile
18
etc/Makefile
|
@ -423,28 +423,28 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
|
||||||
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/atf/etc/atf configinstall
|
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/atf/etc/atf configinstall
|
||||||
.endif
|
.endif
|
||||||
.else # LSC Minix Specific
|
.else # LSC Minix Specific
|
||||||
.for owner group mode sdir tdir file in \
|
.for owner group mode sdir tdir files in \
|
||||||
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ daily \
|
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ daily \
|
||||||
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ dhcptags.conf \
|
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ dhcptags.conf \
|
||||||
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ rc \
|
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ rc \
|
||||||
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/ ${DESTDIR}/usr/lib/ crontab \
|
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/ ${DESTDIR}/usr/lib/ crontab \
|
||||||
${BINOWN} ${BINGRP} ${NONBINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/ Makefile \
|
${BINOWN} ${BINGRP} ${NONBINMODE} ${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/ Makefile \
|
||||||
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ block \
|
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ block \
|
||||||
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ singlechar
|
${BINOWN} ${BINGRP} ${BINMODE} ${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ singlechar \
|
||||||
|
${BINOWN} ${BINGRP} ${NONBINMODE} ${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/usr/ast/ .[aepv]* \
|
||||||
|
${BINOWN} ${BINGRP} ${NONBINMODE} ${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/root/ .[aepv]* \
|
||||||
|
ast ${BINGRP} ${NONBINMODE} ${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/ast/ .[aepv]* \
|
||||||
|
bin ${BINGRP} ${NONBINMODE} ${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/bin/ .[aepv]* \
|
||||||
|
|
||||||
${_MKMSG_INSTALL} ${DESTDIR}${_dir}${file}
|
${_MKMSG_INSTALL} ${DESTDIR}${_dir}${file}
|
||||||
if [ ! -e ${tdir} ]; then \
|
if [ ! -e ${tdir} ]; then \
|
||||||
mkdir -p ${tdir}; \
|
${INSTALL_DIR} ${tdir}; \
|
||||||
fi; \
|
fi; \
|
||||||
if [ ! -e ${tdir}${file} -o -s ${tdir}${file} ]; then \
|
${INSTALL_FILE} -o ${owner} -g ${group} -m ${mode} ${sdir}${files} ${tdir};
|
||||||
${ETC_INSTALL_FILE} -o ${owner} -g ${group} -m ${mode} \
|
|
||||||
${sdir}${file} ${tdir}${file}; \
|
|
||||||
else true; fi
|
|
||||||
.endfor
|
.endfor
|
||||||
.for subdir in . defaults mtree
|
.for subdir in . defaults mtree
|
||||||
${MAKEDIRTARGET} ${subdir} configinstall
|
${MAKEDIRTARGET} ${subdir} configinstall
|
||||||
.endfor
|
.endfor
|
||||||
${_MKMSG_INSTALL} ${DESTDIR}/usr/ast and ${DESTDIR}/root
|
|
||||||
for u in ${DESTDIR}/usr/ast ${DESTDIR}/root; do ${INSTALL_DIR} $$u; cp ${NETBSDSRCDIR}/etc/ast/.[aepv]* $$u; done
|
|
||||||
${_MKMSG_INSTALL} ${DESTDIR}/usr/lib/fonts
|
${_MKMSG_INSTALL} ${DESTDIR}/usr/lib/fonts
|
||||||
${INSTALL_DIR} ${DESTDIR}/usr/lib/fonts
|
${INSTALL_DIR} ${DESTDIR}/usr/lib/fonts
|
||||||
${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/fonts/*.fnt ${DESTDIR}/usr/lib/fonts/
|
${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/fonts/*.fnt ${DESTDIR}/usr/lib/fonts/
|
||||||
|
|
|
@ -133,7 +133,6 @@
|
||||||
./usr/spool/mail
|
./usr/spool/mail
|
||||||
./usr/src
|
./usr/src
|
||||||
./usr/tests
|
./usr/tests
|
||||||
./usr/tests/minix-posix
|
|
||||||
./usr/var
|
./usr/var
|
||||||
./usr/var/db
|
./usr/var/db
|
||||||
./usr/var/db/pkg
|
./usr/var/db/pkg
|
||||||
|
@ -148,6 +147,15 @@
|
||||||
./tmp
|
./tmp
|
||||||
./usr/tmp
|
./usr/tmp
|
||||||
|
|
||||||
|
/set type=dir uid=8 gid=0 mode=755
|
||||||
|
./home/ast
|
||||||
|
|
||||||
|
/set type=dir uid=2 gid=0 mode=755
|
||||||
|
./home/bin
|
||||||
|
|
||||||
|
/set type=dir uid=2 gid=0 mode=755
|
||||||
|
./usr/tests/minix-posix
|
||||||
|
|
||||||
# this one is for term(1)
|
# this one is for term(1)
|
||||||
/set type=dir uid=0 gid=5 mode=775
|
/set type=dir uid=0 gid=5 mode=775
|
||||||
./usr/spool/locks
|
./usr/spool/locks
|
||||||
|
|
Loading…
Reference in a new issue