aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox-initscripts
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-07-22 06:06:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-07-22 06:06:12 +0000
commit2bc0e0bf93ebc8486cda686b659f71a8bae87faa (patch)
treebbd8eb4fe8ef9b05a279e42ffccf44ea8005c267 /main/busybox-initscripts
parentb48804fffa433025b0e6d29f0b90f9345de5b3fa (diff)
downloadaports-2bc0e0bf93ebc8486cda686b659f71a8bae87faa.tar.bz2
aports-2bc0e0bf93ebc8486cda686b659f71a8bae87faa.tar.xz
main/busybox-initscripts: mdev: fix default config to work with newer kernels
It seems like kernel now specify the devices ass foo/bar instead ofi foo/bar. Adjust default mdev.conf to support both. ref #3091
Diffstat (limited to 'main/busybox-initscripts')
-rw-r--r--main/busybox-initscripts/APKBUILD8
-rw-r--r--main/busybox-initscripts/mdev.conf4
2 files changed, 8 insertions, 4 deletions
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 1e84c1f0e1..da87088aa6 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
pkgver=2.2
-pkgrel=21
+pkgrel=22
pkgdesc="Init scripts for busybox daemons"
url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
arch="noarch"
@@ -69,7 +69,7 @@ aed11322e338cb98a22b11fe71200c58 watchdog.initd
22adbf155ffc4595206ded6daad07812 rdate.confd
77fb31a75511247bf4e3430565a276bc syslog.confd
0bb55dde32f5e119111fa4938daaef3d watchdog.confd
-ed579ee880255609ff5ed80ef239916e mdev.conf
+814ea808849a140f7a9620adc883a34e mdev.conf
ad1556961294e4aa2abca6be52138b7c dvbdev
5c8725b4cbdeda23b00f08124a0d20bf ide_links
daf57f3d0372f825ddc05b00973e5afe usbdev
@@ -94,7 +94,7 @@ f6cd63d6e5f384dcb01a4906c9a0b6c5923794380235dfe0d79b48a686b03c5d klogd.confd
791d49802395861a5f788dc7436c1260ec2cd3bdea0c790952ae1b2dd518e811 rdate.confd
8a2362d6b5b1ec1d754878726392119f2cc7416c748ee4f2ab134f731d6e6198 syslog.confd
77f6f9069afdbb477a7e822aa2c7265d64fd22fdd9338bb3beb0cee901d202ce watchdog.confd
-2075f2b69a14d795d6ea158513eb6f240106948249534ecf4b79ea76b6cc4ff4 mdev.conf
+1ef7d130b45c3681db170709b902912500b874a4c26f4f59733c380368cc2b9f mdev.conf
ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de dvbdev
3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 ide_links
dcb0c37590019bccb4c31a5372cbf7728eae6f1174d56bf0708d7504243a5fbb usbdev
@@ -119,7 +119,7 @@ b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54
3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7 rdate.confd
330c6e6808dfdf05c75dcdec1048f17052f79b285e11513a64a97bf28fb60e023840966abe03a74fa146eb6b842c4e0e78df82918528e0b6e8f546f7f0a4e323 syslog.confd
359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4 watchdog.confd
-9195a08d1c403debdfd046feb2ca646c7dc9cdb7d889da17332d47dd68ebf7ca5a84cf33a0c062cd820febc3b297845403d919560ee819a29d57c9f5b172eabe mdev.conf
+adf256d1d55f74e34b34f0dd1c1cd03598be28e8e64426962809de159045ce0f9038bee687c971a579285d43f2f6ed8e44909eed52974021e463211b0c3fec65 mdev.conf
ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a dvbdev
0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec ide_links
b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 354af56963..bf1c83c45f 100644
--- a/main/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
@@ -100,11 +100,15 @@ tap[0-9]* root:root 0600 =net/
# zaptel devices
zap(.*) root:dialout 0660 =zap/%1
dahdi!(.*) root:dialout 0660 =dahdi/%1
+dahdi/(.*) root:dialout 0660 =dahdi/%1
# raid controllers
cciss!(.*) root:disk 0660 =cciss/%1
+cciss/(.*) root:disk 0660 =cciss/%1
ida!(.*) root:disk 0660 =ida/%1
+ida/(.*) root:disk 0660 =ida/%1
rd!(.*) root:disk 0660 =rd/%1
+rd/(.*) root:disk 0660 =rd/%1
sr0 root:cdrom 0660 @ln -sf $MDEV cdrom