Annotation of /trunk/virtualbox/patches/virtualbox-4.0.10-additions-magellan.patch
Parent Directory | Revision Log
Revision 1390 -
(hide annotations)
(download)
Thu Jun 30 21:39:30 2011 UTC (13 years, 2 months ago) by niro
File size: 4076 byte(s)
Thu Jun 30 21:39:30 2011 UTC (13 years, 2 months ago) by niro
File size: 4076 byte(s)
-added service info for rc-config in virtualbox-additions
1 | niro | 1390 | diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh VirtualBox-4.0.10_OSE-magellan/src/VBox/Additions/linux/installer/vboxadd-service.sh |
2 | --- VirtualBox-4.0.10_OSE/src/VBox/Additions/linux/installer/vboxadd-service.sh 2011-06-27 15:59:29.000000000 +0200 | ||
3 | +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Additions/linux/installer/vboxadd-service.sh 2011-07-01 01:41:25.000000000 +0200 | ||
4 | @@ -25,6 +25,15 @@ | ||
5 | # Description: VirtualBox Additions Service | ||
6 | ### END INIT INFO | ||
7 | |||
8 | +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k | ||
9 | +#%start: 65 | ||
10 | +#%stop: 35 | ||
11 | + | ||
12 | +#deps | ||
13 | +#%needs: | ||
14 | +#%before: | ||
15 | +#%after: | ||
16 | + | ||
17 | PATH=$PATH:/bin:/sbin:/usr/sbin | ||
18 | |||
19 | system=unknown | ||
20 | @@ -40,6 +49,9 @@ | ||
21 | elif [ -f /etc/gentoo-release ]; then | ||
22 | system=gentoo | ||
23 | PIDFILE="/var/run/vboxadd-service" | ||
24 | +elif [ -f /etc/mageversion ]; then | ||
25 | + system=magellan | ||
26 | + PIDFILE="/var/run/vboxadd-service" | ||
27 | elif [ -f /etc/arch-release ]; then | ||
28 | system=arch | ||
29 | PIDFILE="/var/run/vboxadd-service" | ||
30 | @@ -143,6 +155,29 @@ | ||
31 | fi | ||
32 | fi | ||
33 | |||
34 | +if [ "$system" = "magellan" ]; then | ||
35 | + . /etc/rc.d/init.d/functions | ||
36 | + daemon() { | ||
37 | + start-stop-daemon --start --exec $1 -- $2 | ||
38 | + } | ||
39 | + | ||
40 | + killproc() { | ||
41 | + start-stop-daemon --stop --exec $@ | ||
42 | + } | ||
43 | + | ||
44 | + fail_msg() { | ||
45 | + evaluate_retval | ||
46 | + } | ||
47 | + | ||
48 | + succ_msg() { | ||
49 | + evaluate_retval | ||
50 | + } | ||
51 | + | ||
52 | + begin() { | ||
53 | + echo -e ${COLOREDSTAR}"$1" | ||
54 | + } | ||
55 | +fi | ||
56 | + | ||
57 | if [ "$system" = "arch" ]; then | ||
58 | USECOLOR=yes | ||
59 | . /etc/rc.d/functions | ||
60 | diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-4.0.10_OSE-magellan/src/VBox/Additions/linux/installer/vboxadd.sh | ||
61 | --- VirtualBox-4.0.10_OSE/src/VBox/Additions/linux/installer/vboxadd.sh 2011-06-27 15:59:29.000000000 +0200 | ||
62 | +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Additions/linux/installer/vboxadd.sh 2011-07-01 01:39:49.000000000 +0200 | ||
63 | @@ -28,6 +28,15 @@ | ||
64 | # Description: VirtualBox Linux Additions kernel modules | ||
65 | ### END INIT INFO | ||
66 | |||
67 | +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k | ||
68 | +#%start: 70 | ||
69 | +#%stop: 30 | ||
70 | + | ||
71 | +#deps | ||
72 | +#%needs: | ||
73 | +#%before: | ||
74 | +#%after: | ||
75 | + | ||
76 | PATH=$PATH:/bin:/sbin:/usr/sbin | ||
77 | PACKAGE=VBoxGuestAdditions | ||
78 | BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/vboxguest/build_in_tmp 2>/dev/null|cut -d' ' -f1` | ||
79 | @@ -66,6 +75,8 @@ | ||
80 | system=suse | ||
81 | elif [ -f /etc/gentoo-release ]; then | ||
82 | system=gentoo | ||
83 | +elif [ -f /etc/mageversion ]; then | ||
84 | + system=magellan | ||
85 | elif [ -f /etc/lfs-release -a -d /etc/rc.d/init.d ]; then | ||
86 | system=lfs | ||
87 | else | ||
88 | @@ -138,6 +149,19 @@ | ||
89 | fi | ||
90 | fi | ||
91 | |||
92 | +if [ "$system" = "magellan" ]; then | ||
93 | + . /etc/rc.d/init.d/functions | ||
94 | + fail_msg() { | ||
95 | + evaluate_retval | ||
96 | + } | ||
97 | + succ_msg() { | ||
98 | + evaluate_retval | ||
99 | + } | ||
100 | + begin() { | ||
101 | + echo -e ${COLOREDSTAR}"$1" | ||
102 | + } | ||
103 | +fi | ||
104 | + | ||
105 | if [ "$system" = "lfs" ]; then | ||
106 | . /etc/rc.d/init.d/functions | ||
107 | fail_msg() { | ||
108 | diff -Naur VirtualBox-4.0.10_OSE/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-4.0.10_OSE-magellan/src/VBox/Additions/linux/installer/vboxadd-x11.sh | ||
109 | --- VirtualBox-4.0.10_OSE/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2011-06-27 15:59:29.000000000 +0200 | ||
110 | +++ VirtualBox-4.0.10_OSE-magellan/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2011-07-01 01:40:16.000000000 +0200 | ||
111 | @@ -28,6 +28,15 @@ | ||
112 | # Description: VirtualBox Linux Additions X11 setup | ||
113 | ### END INIT INFO | ||
114 | |||
115 | +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k | ||
116 | +#%start: 70 | ||
117 | +#%stop: 30 | ||
118 | + | ||
119 | +#deps | ||
120 | +#%needs: | ||
121 | +#%before: | ||
122 | +#%after: | ||
123 | + | ||
124 | PATH=$PATH:/bin:/sbin:/usr/sbin | ||
125 | LOG="/var/log/vboxadd-install-x11.log" | ||
126 | CONFIG_DIR="/var/lib/VBoxGuestAdditions" | ||
127 | @@ -75,6 +84,8 @@ | ||
128 | system=suse | ||
129 | elif [ -f /etc/gentoo-release ]; then | ||
130 | system=gentoo | ||
131 | +elif [ -f /etc/mageversion ]; then | ||
132 | + system=magellan | ||
133 | elif [ -f /etc/lfs-release -a -d /etc/rc.d/init.d ]; then | ||
134 | system=lfs | ||
135 | else | ||
136 | @@ -147,6 +158,19 @@ | ||
137 | fi | ||
138 | fi | ||
139 | |||
140 | +if [ "$system" = "magellan" ]; then | ||
141 | + . /etc/rc.d/init.d/functions | ||
142 | + fail_msg() { | ||
143 | + evaluate_retval | ||
144 | + } | ||
145 | + succ_msg() { | ||
146 | + evaluate_retval | ||
147 | + } | ||
148 | + begin() { | ||
149 | + echo -e ${COLOREDSTAR}"$1" | ||
150 | + } | ||
151 | +fi | ||
152 | + | ||
153 | if [ "$system" = "lfs" ]; then | ||
154 | . /etc/rc.d/init.d/functions | ||
155 | fail_msg() { |