X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=MAKEDEV;h=e0d78a2e60e498a10c3631446a35d0c5231c477b;hb=4eea58d5c9382d8431b3e8dc1c6edfe2476fee29;hp=bc781a82413b22d41ab517fff61a08be9a665b10;hpb=a9714d19231f2125688daad203d0ebd2b46d6f8d;p=debian%2Fmakedev

diff --git a/MAKEDEV b/MAKEDEV
index bc781a8..e0d78a2 100644
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -31,7 +31,7 @@ scanner="  root root   0666"
    coda="  root root   0600"
   ipsec="  root root   0200"
 readable="  root root   0444"
-   lirc="  root lirc   0640"
+   lirc="  root video   0640"
 
 MAXVT=63
 
@@ -151,6 +151,38 @@ makedev () {	# usage: makedev name [bcu] major minor owner group mode
 		fi
 	fi
 }
+makefifo () { # usage: makefifo name owner group mode
+	if [ "$opt_v" ]
+	then	if [ "$opt_d" ]
+		then	echo "delete $1"
+		else	echo "create $1 $2:$3 $4" 
+		fi
+	fi
+	# missing parameters are a bug - bail - should we do an exit 1 here?
+	case :$1:$2:$3:$4: in
+		*::*) echo "Warning: MAKEFIFO $@ is missing parameter(s)." >&2;;
+	esac
+	if [ ! "$opt_n" ]
+	then	
+		if [ "$opt_d" ]
+		then
+			rm -f $1
+		else
+			rm -f $1-
+			if mknod $1- p &&
+			   chown $2:$3 $1- &&
+			   chmod $4 $1- &&
+			   mv $1- $1
+			then
+				:	# it worked
+			else
+					# Didn't work, clean up any mess...
+				echo "makefifo $@: failed"
+				rm -f $1-
+			fi
+		fi
+	fi
+}
 symlink () {	# usage: symlink name target
 	if [ "$opt_v" ]
 	then	if [ "$opt_d" ]
@@ -324,7 +356,7 @@ do
 	case $arg in
 	generic)
 		# pick the right generic-<arch> using dpkg's knowledge
-		case `dpkg --print-installation-architecture` in
+		case `dpkg --print-architecture` in
 			alpha)
 				$0 $opts generic-alpha
 				;;
@@ -696,7 +728,7 @@ do
 		;;
 	adb)
 		# pick the right arch device using dpkg's knowledge
-		case `dpkg --print-installation-architecture` in
+		case `dpkg --print-architecture` in
 			powerpc)
 				# ADB bus devices (char)
 				makedev adb c 56 0 $mouse
@@ -1096,7 +1128,7 @@ do
 		makedev irnet c 10 187 $system
 		;;
 	cbm)
-		makedev cbm c 10 177 $system
+		makedev cbm c 10 177 $floppy
 		;;
 	misc)
 		major=`Major mouse 10` || continue
@@ -2103,9 +2135,9 @@ do
 		done
                 ;;
         lirc)
-                mknod lirc c 61 0 $lirc
+                makedev lirc c 61 0 $lirc
                 for i in d m; do
-                   makedev lirc${i} p $lirc
+                   makefifo lirc${i} $lirc
                 done
                 ;;
 	update)