diff options
| author | dim <dim@FreeBSD.org> | 2016-01-06 21:31:07 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-01-06 21:31:07 +0000 |
| commit | 90a2cc030c5633b2f7afbfda628c7663ed19571e (patch) | |
| tree | 2fa1f2aa7a1f7a446f26d2e5084ab0f1f1b58d0d /etc | |
| parent | dbb39bb8b60f0b64dc07de74bbf124cc883df1f5 (diff) | |
| parent | 7efc78616813fc93824da961d10663c78e23315b (diff) | |
| download | FreeBSD-src-90a2cc030c5633b2f7afbfda628c7663ed19571e.zip FreeBSD-src-90a2cc030c5633b2f7afbfda628c7663ed19571e.tar.gz | |
Merge ^/head r293175 through r293279.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 2 | ||||
| -rw-r--r-- | etc/rc | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index ad76402..ff32324 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -622,6 +622,8 @@ .. pw .. + rpcbind + .. sa .. .. @@ -130,11 +130,17 @@ for _rc_elem in ${files}; do done # Remove the firstboot sentinel, and reboot if it was requested. +# Be a bit paranoid about removing it to handle the common failure +# modes since the consequence of failure can be big. +# Note: this assumes firstboot_sentinel is on / when we have +# a read-only /, or that it is on media that's writable. if [ -e ${firstboot_sentinel} ]; then [ ${root_rw_mount} = "yes" ] || mount -uw / - /bin/rm ${firstboot_sentinel} + chflags -R 0 ${firstboot_sentinel} + rm -rf ${firstboot_sentinel} if [ -e ${firstboot_sentinel}-reboot ]; then - /bin/rm ${firstboot_sentinel}-reboot + chflags -R 0 ${firstboot_sentinel}-reboot + rm -rf ${firstboot_sentinel}-reboot [ ${root_rw_mount} = "yes" ] || mount -ur / kill -INT 1 fi |
