diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 09:22:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 09:22:06 +0000 |
| commit | 6aba975e73e7cea833640e8db180c0add01ecf33 (patch) | |
| tree | 258e71b68383108d4634e0546dbd0decb948695d /features.d | |
| parent | f9796dc318ddbf24f8f1fad67aeaea07fe416bd9 (diff) | |
| parent | 3c0420ee47d4389f4e6b8faeb109b0901835898f (diff) | |
| download | mkinitfs-6aba975e73e7cea833640e8db180c0add01ecf33.tar.bz2 mkinitfs-6aba975e73e7cea833640e8db180c0add01ecf33.tar.xz | |
Merge branch 'master' into nlplug-findfs
Diffstat (limited to 'features.d')
| -rw-r--r-- | features.d/bootchart.files | 2 | ||||
| -rw-r--r-- | features.d/virtio.modules | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/features.d/bootchart.files b/features.d/bootchart.files index 8adf4df..6f28294 100644 --- a/features.d/bootchart.files +++ b/features.d/bootchart.files @@ -1,3 +1,4 @@ +/sbin/bootchartd /usr/bin/ac /usr/bin/last /usr/bin/lastcomm @@ -5,4 +6,3 @@ /usr/sbin/dump-acct /usr/sbin/accton /usr/sbin/sa - diff --git a/features.d/virtio.modules b/features.d/virtio.modules index fa74c10..b0e6c22 100644 --- a/features.d/virtio.modules +++ b/features.d/virtio.modules @@ -1,2 +1,3 @@ kernel/drivers/block/virtio* kernel/drivers/virtio +kernel/drivers/net/virtio_net* |