diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-10-31 19:02:42 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-10-31 19:02:42 +0000 |
| commit | 02ebdc78239c4e929e42896931a4f04526e04440 (patch) | |
| tree | b2635ce18a57392f126c5599b6baaf68c4b92575 /etc | |
| parent | 5763f79695f9b1ffacce55a8594cb7be08c3f31c (diff) | |
| parent | 130a08a362287342b83f8a78914db38a325145a3 (diff) | |
| download | src-02ebdc78239c4e929e42896931a4f04526e04440.tar.gz src-02ebdc78239c4e929e42896931a4f04526e04440.zip | |
Merge ^/head r307736 through r308146.
Notes
Notes:
svn path=/projects/clang390-import/; revision=308147
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/devd/usb.conf | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.root.dist | 2 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 7 | ||||
| -rwxr-xr-x | etc/rc.d/swaplate | 2 |
5 files changed, 12 insertions, 7 deletions
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf index 3d8858b95d7a..3c6e560810d1 100644 --- a/etc/devd/usb.conf +++ b/etc/devd/usb.conf @@ -2713,7 +2713,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "0x8152"; + match "product" "(0x8152|0x8153)"; action "kldload -n if_ure"; }; diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 1c1a1ddad177..3a7bdeb6d4a8 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -32,6 +32,8 @@ .. casper .. + cron.d + .. defaults .. devd @@ -135,16 +135,16 @@ done # 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#[Yy][Ee][Ss]} = "" ] || mount -uw / + checkyesno root_rw_mount && mount -uw / chflags -R 0 ${firstboot_sentinel} rm -rf ${firstboot_sentinel} if [ -e ${firstboot_sentinel}-reboot ]; then chflags -R 0 ${firstboot_sentinel}-reboot rm -rf ${firstboot_sentinel}-reboot - [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / + checkyesno root_rw_mount && mount -ur / kill -INT 1 fi - [ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur / + checkyesno root_rw_mount && mount -ur / fi echo '' diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index ad43a20a268f..320e550aeb8a 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -118,14 +118,17 @@ FILES= DAEMON \ ugidfw \ ${_utx} \ var \ - watchdogd \ - ypbind \ + watchdogd + +.if ${MK_NIS} != "no" +FILES+= ypbind \ ypldap \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd +.endif .if ${MK_ACCT} != "no" FILESGROUPS+= ACCT diff --git a/etc/rc.d/swaplate b/etc/rc.d/swaplate index f335481b6e47..fbfae2ad9bfe 100755 --- a/etc/rc.d/swaplate +++ b/etc/rc.d/swaplate @@ -12,7 +12,7 @@ name="swaplate" desc="Setup late swap space" start_cmd='/sbin/swapon -aLq' -stop_cmd='/sbin/swapoff -aq' +stop_cmd='/sbin/swapoff -aLq' load_rc_config swap run_rc_command "$1" |