[Pkg-virtualbox-devel] Bug#475297: virtualbox-ose: New patch (for using log_action_cont_msg)

[Daniel Hahler]

Package: virtualbox-ose
Version: 1.6.2-dfsg-1
Followup-For: Bug #475297
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu hardy ubuntu-patch

Michael Meskes wrote:

> On Wed, Apr 09, 2008 at 11:06:37PM +0200, Daniel Hahler wrote:
>> In Ubuntu, we've applied the attached patch to achieve the following:
>>
>>   * debian/virtualbox-ose-guest-utils.init:
>>     Use log_action_cont_msg instead of log_warning_msg to not cause display
>>     issues in usplash (without "quiet"), when not running in VirtualBox.
> 
> I'm not quite sure about this patch. It essentially removes the fancy
> output and the CR after the output. But, since there is no
> begin_msg before nor any end_msg after this call I wonder whether this
> is the desired behaviour, especially the missing CR at the end.

I agree that there should probably be a "end_msg".

I've modified the patch accordingly.

I'm not sure about it though - I've just used the same method as Kees Cook did for powernowd (in 0.97-2ubuntu4), replacing "log_success_msg" with "log_action_cont_msg". But in this case there were calls to log_begin_msg / log_end_msg already.

The reason for this patch after all is, that usplash displays the message corrupted when only using log_warning_msg, like it's done in Debian.


-- 
http://daniel.hahler.de/
-------------- next part --------------
diff -u virtualbox-ose-1.6.2-dfsg/debian/virtualbox-ose-guest-utils.init virtualbox-ose-1.6.2-dfsg/debian/virtualbox-ose-guest-utils.init
--- virtualbox-ose-1.6.2-dfsg/debian/virtualbox-ose-guest-utils.init
+++ virtualbox-ose-1.6.2-dfsg/debian/virtualbox-ose-guest-utils.init
@@ -17,7 +17,8 @@
 in_virtual_machine()
 {
 	if [ -z "$(lspci -d 80ee:beef)" ]; then
-		log_warning_msg 'VirtualBox Additions Disabled, not in a Virtual Machine';
+		log_action_cont_msg 'VirtualBox Additions Disabled, not in a Virtual Machine';
+		log_end_msg 1
 		return 1
 	fi