Gentoo Archives: gentoo-commits

From: "Daniel Drake (dsd)" <dsd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udftools/files: pktcdvd.init
Date: Fri, 31 Oct 2008 20:07:44
Message-Id: E1Kw0HV-0007CN-Ld@stork.gentoo.org
1 dsd 08/10/31 20:07:41
2
3 Modified: pktcdvd.init
4 Log:
5 Make pktcdvd initscript POSIX-compatible, patch from Martin Väth in bug #192420
6 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r2 i686)
7
8 Revision Changes Path
9 1.2 sys-fs/udftools/files/pktcdvd.init
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udftools/files/pktcdvd.init?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udftools/files/pktcdvd.init?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udftools/files/pktcdvd.init?r1=1.1&r2=1.2
14
15 Index: pktcdvd.init
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sys-fs/udftools/files/pktcdvd.init,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- pktcdvd.init 5 Sep 2005 22:10:58 -0000 1.1
22 +++ pktcdvd.init 31 Oct 2008 20:07:41 -0000 1.2
23 @@ -1,14 +1,14 @@
24 #!/sbin/runscript
25 # Copyright 1999-2005 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License, v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/files/pktcdvd.init,v 1.1 2005/09/05 22:10:58 dsd Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/files/pktcdvd.init,v 1.2 2008/10/31 20:07:41 dsd Exp $
29
30 depend() {
31 need localmount modules
32 }
33
34 checkconfig() {
35 - if [[ ! -e /dev/pktcdvd/control ]]; then
36 + if ! [ -e /dev/pktcdvd/control ]; then
37 eerror "Could not find packet-writing control device at /dev/pktcdvd/control"
38 eerror "Please ensure that your kernel includes packet writing support,"
39 eerror "and if modular, ensure that the module is loaded."
40 @@ -18,15 +18,19 @@
41
42 get_rw_devices() {
43 devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
44 - devices=($devices_raw)
45 + count=0
46 + for i in $devices_raw; do
47 + eval "devices_$count=\"\$i\""
48 + count=$(( $count + 1 ))
49 + done
50 devs=""
51
52 cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
53
54 count=0
55 for i in $cdrw_caps; do
56 - [[ $i == 1 ]] && devs="${devs} ${devices[$count]}"
57 - ((count++))
58 + [ "$i" -eq 1 ] && eval "devs=\"\$devs \$devices_$count\""
59 + count=$(( $count + 1 ))
60 done
61
62 echo ${devs}
63 @@ -38,12 +42,12 @@
64 for i in $(get_rw_devices)
65 do
66 devnode="/dev/${i}"
67 - [[ ! -e ${devnode} ]] && continue
68 + [ -e "${devnode}" ] || continue
69
70 - /usr/bin/pktsetup ${i} ${devnode} > /dev/null
71 - [[ ! -e /dev/pktcdvd/${i} ]] && continue
72 - chmod 660 /dev/pktcdvd/${i}
73 - chgrp cdrw /dev/pktcdvd/${i}
74 + /usr/bin/pktsetup "${i}" "${devnode}" > /dev/null
75 + [ -e "/dev/pktcdvd/${i}" ] || continue
76 + chmod 660 "/dev/pktcdvd/${i}"
77 + chgrp cdrw "/dev/pktcdvd/${i}"
78 done
79 }
80
81 @@ -52,7 +56,7 @@
82
83 for i in $(get_rw_devices)
84 do
85 - /usr/bin/pktsetup -d ${i} > /dev/null
86 + /usr/bin/pktsetup -d "${i}" > /dev/null
87 done
88 }