projects
/
debian
/
makedev
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian patch 2.3.1-87
[debian/makedev]
/
MAKEDEV
diff --git
a/MAKEDEV
b/MAKEDEV
index 6fba12ad1aaca2478557554ff281ed45afa9dfe5..c8b1e133986134662c36b032716f055c881aa688 100644
(file)
--- a/
MAKEDEV
+++ b/
MAKEDEV
@@
-31,6
+31,7
@@
scanner=" root root 0666"
coda=" root root 0600"
ipsec=" root root 0200"
readable=" root root 0444"
coda=" root root 0600"
ipsec=" root root 0200"
readable=" root root 0444"
+ lirc=" root lirc 0640"
MAXVT=63
MAXVT=63
@@
-49,12
+50,14
@@
if [ "$WRITE_ON_UDEV" ]; then
:
elif [ -d /dev/.static/dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
&& grep -qE '^[^ ]+ /dev/\.static/dev' /proc/mounts; then
:
elif [ -d /dev/.static/dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
&& grep -qE '^[^ ]+ /dev/\.static/dev' /proc/mounts; then
+ echo "udev active, devices will be created in /dev/.static/dev/"
cd /dev/.static/dev/
elif [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
&& grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
cd /dev/.static/dev/
elif [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
&& grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
+ echo "udev active, devices will be created in /.dev/"
cd /.dev/
elif [ -d .udevdb/ -o -d .udev/ ] && [ "`pwd`" = /dev ]; then
cd /.dev/
elif [ -d .udevdb/ -o -d .udev/ ] && [ "`pwd`" = /dev ]; then
- echo ".udevdb presence implies active udev. Aborting MAKEDEV invocation."
+ echo ".udevdb
or .udev
presence implies active udev. Aborting MAKEDEV invocation."
# use exit 0, not 1, so postinst scripts don't fail on this
exit 0
fi
# use exit 0, not 1, so postinst scripts don't fail on this
exit 0
fi
@@
-112,7
+115,8
@@
opts="${opt_n:+-n} ${opt_v:+-v} ${opt_d:+-d}"
#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
devicename () { # translate device names to something safe
#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
devicename () { # translate device names to something safe
- echo "$*" | sed -e 's/[^A-Za-z0-9_]/_/g'
+ # A-Z is not full alphabet in all locales (e.g. in et_EE)
+ echo "$*" | LC_ALL=C sed -e 's/[^A-Za-z0-9_]/_/g'
}
makedev () { # usage: makedev name [bcu] major minor owner group mode
}
makedev () { # usage: makedev name [bcu] major minor owner group mode
@@
-254,7
+258,6
@@
cvt () {
st) echo st0 ;;
xd) echo xda xdb ;;
ad) echo ada adb ;;
st) echo st0 ;;
xd) echo xda xdb ;;
ad) echo ada adb ;;
- fd) echo fd0 fd1 ;;
lp) echo lp ;;
mt) echo ftape ;;
qft) echo ftape ;;
lp) echo lp ;;
mt) echo ftape ;;
qft) echo ftape ;;
@@
-316,6
+319,8
@@
cvt () {
for arg in `cvt $*`
do
for arg in `cvt $*`
do
+ # this is to make the case patterns work as expected in all locales
+ LC_ALL=C
case $arg in
generic)
# pick the right generic-<arch> using dpkg's knowledge
case $arg in
generic)
# pick the right generic-<arch> using dpkg's knowledge
@@
-323,13
+328,13
@@
do
alpha)
$0 $opts generic-alpha
;;
alpha)
$0 $opts generic-alpha
;;
- arm|armeb)
+ arm|armeb
|armel
)
$0 $opts generic-arm
;;
hppa)
$0 $opts generic-hppa
;;
$0 $opts generic-arm
;;
hppa)
$0 $opts generic-hppa
;;
- i386)
+ i386
|lpia
)
$0 $opts generic-i386
;;
amd64)
$0 $opts generic-i386
;;
amd64)
@@
-602,7
+607,7
@@
do
symlink core $procfs/kcore
makedev full c 1 7 $public
makedev random c 1 8 $public
symlink core $procfs/kcore
makedev full c 1 7 $public
makedev random c 1 8 $public
- makedev urandom c 1 9 $
readable
+ makedev urandom c 1 9 $
public
makedev tty c 5 0 $tty
$0 $opts ram
$0 $opts loop
makedev tty c 5 0 $tty
$0 $opts ram
$0 $opts loop
@@
-617,6
+622,12
@@
do
makedev scc$unit c 34 $unit $system
done
;;
makedev scc$unit c 34 $unit $system
done
;;
+ mtd)
+ for unit in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+ do
+ makedev mtd$unit c 90 `math $unit \* 2` $system
+ done
+ ;;
bc)
for unit in 0 1 2 3
do
bc)
for unit in 0 1 2 3
do
@@
-717,6
+728,10
@@
do
makedev video1394/$i c 171 `math 16 + $i` $video
done
;;
makedev video1394/$i c 171 `math 16 + $i` $video
done
;;
+ alsa)
+ echo "You requested 'alsa' devices. Please install the alsa-base package instead,"
+ echo "which creates and maintains device information for ALSA."
+ ;;
nvram)
makedev nvram c 10 144 $mouse
;;
nvram)
makedev nvram c 10 144 $mouse
;;
@@
-1052,6
+1067,10
@@
do
major=`Major $arg 10` || continue
makedev $arg c $major 183 $private
;;
major=`Major $arg 10` || continue
makedev $arg c $major 183 $private
;;
+ mcelog)
+ major=`Major $arg 10` || continue
+ makedev $arg c $major 227 $private
+ ;;
cpu|microcode)
mkdir -p cpu
makedev cpu/microcode c 10 184 $private
cpu|microcode)
mkdir -p cpu
makedev cpu/microcode c 10 184 $private
@@
-1076,6
+1095,9
@@
do
irnet)
makedev irnet c 10 187 $system
;;
irnet)
makedev irnet c 10 187 $system
;;
+ cbm)
+ makedev cbm c 10 177 $floppy
+ ;;
misc)
major=`Major mouse 10` || continue
makedev logibm c $major 0 $mouse
misc)
major=`Major mouse 10` || continue
makedev logibm c $major 0 $mouse
@@
-1136,6
+1158,7
@@
do
makedev systrace c 10 226 $private
;;
uinput)
makedev systrace c 10 226 $private
;;
uinput)
+ mkdir -p input
makedev input/uinput c 10 223 $mouse
;;
js)
makedev input/uinput c 10 223 $mouse
;;
js)
@@
-1601,7
+1624,8
@@
do
;;
md)
major=`Major md 9` || continue
;;
md)
major=`Major md 9` || continue
- for part in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+ for part in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 \
+ 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
do
makedev md$part b $major $part $disk
done
do
makedev md$part b $major $part $disk
done
@@
-1660,11
+1684,12
@@
do
done
;;
pktcdvd)
done
;;
pktcdvd)
- major=97
- for unit in 0 1 2 3
- do
- makedev pktcdvd$unit b $major $unit $cdrom
- done
+ echo "pktcdvd major number is now dynamic, taking no action"
+ # major=97
+ # for unit in 0 1 2 3
+ # do
+ # makedev pktcdvd$unit b $major $unit $cdrom
+ # done
;;
cfs0)
makedev cfs0 c 67 0 $coda
;;
cfs0)
makedev cfs0 c 67 0 $coda
@@
-2077,6
+2102,12
@@
do
makedev pf$i b 47 $i $floppy
done
;;
makedev pf$i b 47 $i $floppy
done
;;
+ lirc)
+ mknod lirc c 61 0 $lirc
+ for i in d m; do
+ makedev lirc${i} p $lirc
+ done
+ ;;
update)
devices=
if [ ! -f $procfs/devices ]
update)
devices=
if [ ! -f $procfs/devices ]