On Wed, Jan 18, 2012 at 05:19:43PM -0800, Ansis Atteka wrote:
> This will print a warning and avoid user-space restart
> if system already had 1.3 or older OVS installed. This is
> a workaround for a bug where older kernel modules could not
> communicate with newer user-space.
>
> Issue: 9128
>
> Signed-off-by: Ansis Atteka <[email protected]>
> Reported-by: Michael Kruze <[email protected]>
I ran "debdiff --controlfiles=ALL" to compare the old and new .deb
packages after this change is made. I'm appending the results.
Summary: this commit changes much more than it is intended to. We can
fix that, but since this bug needs to get fixed right away, and the
problems that I pointed out are hypothetical anyway, I don't think we
should wait for that,
Let's commit your original fix, with the minor improvements that I
suggested in my first review. Then we can improve it later.
----------------------------------------------------------------------
================= openvswitch-brcompat_1.5.90-1_i386.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
No differences were encountered between the postinst files
================= openvswitch-common_1.5.90-1_i386.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
================= openvswitch-controller_1.5.90-1_i386.deb ==============
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in first .deb but not in second
-------------------------------------
-rwxr-xr-x root/root DEBIAN/prerm
No differences were encountered between the conffiles files
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-452-] {+448+}
Postinst files: lines which differ (wdiff format)
-------------------------------------------------
[-if [ -n "$2" ]; then-]
[- _dh_action=restart-]
[- else-]
[- _dh_action=start-]
[- fi-]
[- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then-]
[- invoke-rc.d openvswitch-controller $_dh_action || exit $?-]
[- else-]
[- /etc/init.d/openvswitch-controller $_dh_action || exit $?-]
[- fi-]
[-fi-]
[-# End automatically added section-]
[-# Automatically added by dh_installinit-]
[-if [ -x "/etc/init.d/openvswitch-controller" ]; then-]
[- update-rc.d openvswitch-controller defaults >/dev/null-]
[- if [ -n "$2" ]; then-]
[- _dh_action=restart-]
[- else-]
[- _dh_action=start-]
[- fi-]
[- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then-]
[- invoke-rc.d openvswitch-controller $_dh_action ||
init_script_error-]
[- else-]
[- /etc/init.d/openvswitch-controller $_dh_action-] ||
init_script_error
[-fi-]
Postrm files: lines which differ (wdiff format)
-----------------------------------------------
[-# Automatically added by dh_installinit-]
[-if [ "$1" = "purge" ] ; then-]
[- update-rc.d openvswitch-controller remove >/dev/null-]
[-fi-]
[-# End automatically added section-]
================= openvswitch-datapath-dkms_1.5.90-1_all.deb ==============
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root
/usr/src/openvswitch-1.5.90/debian/openvswitch-switch.prerm
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-14292-] {+14296+}
No differences were encountered between the postinst files
No differences were encountered between the prerm files
================= openvswitch-datapath-source_1.5.90-1_all.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
================= openvswitch-dbg_1.5.90-1_i386.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
================= openvswitch-ipsec_1.5.90-1_i386.deb ==============
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in first .deb but not in second
-------------------------------------
-rwxr-xr-x root/root DEBIAN/prerm
No differences were encountered between the conffiles files
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-128-] {+124+}
Postinst files: lines which differ (wdiff format)
-------------------------------------------------
[-if [ -n "$2" ]; then-]
[- _dh_action=restart-]
[- else-]
[- _dh_action=start-]
[- fi-]
[- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then-]
[- invoke-rc.d openvswitch-ipsec $_dh_action || exit $?-]
[- else-]
[- /etc/init.d/openvswitch-ipsec $_dh_action || exit $?-]
[- fi-]
[-fi-]
[-# End automatically added section-]
[-# Automatically added by dh_installinit-]
[-if [ -x "/etc/init.d/openvswitch-ipsec" ]; then-]
[- update-rc.d openvswitch-ipsec defaults >/dev/null-]
[- if [ -n "$2" ]; then-]
[- _dh_action=restart-]
[- else-]
[- _dh_action=start-]
[- fi-]
[- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then-]
[- invoke-rc.d openvswitch-ipsec $_dh_action || init_script_error-]
[- else-]
[- /etc/init.d/openvswitch-ipsec $_dh_action-] || init_script_error
[-fi-]
Postrm files: lines which differ (wdiff format)
-----------------------------------------------
[-# Automatically added by dh_installinit-]
[-if [ "$1" = "purge" ] ; then-]
[- update-rc.d openvswitch-ipsec remove >/dev/null-]
[-fi-]
[-# End automatically added section-]
================= openvswitch-pki_1.5.90-1_all.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
No differences were encountered between the postinst files
================= openvswitch-switch_1.5.90-1_i386.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the conffiles files
No differences were encountered between the control files
Postinst files: lines which differ (wdiff format)
-------------------------------------------------
[-# Automatically added by dh_installinit-]
{+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 1.4; then+}
{+ printf "\nThere is an upgrade bug from pre-1.4 Open vSwitch. As a\n"+}
{+ printf "workaround you must manually run force-reload-kmod command\n"+}
{+ printf "or reboot the system to finish the upgrade.\n\n"+}
{+else+}
{+invoke-rc.d openvswitch-switch $_dh_action || init_script_error+}
{+ fi+}
{+fi+}
{++}
{+# Automatically added by dh_installinit+}
if [ -x [-"`which invoke-rc.d 2>/dev/null`"-]
{+"/etc/init.d/openvswitch-switch"+} ]; then
[-invoke-rc.d-]
{+update-rc.d+} openvswitch-switch [-$_dh_action || init_script_error-]
[- else-]
[- /etc/init.d/openvswitch-switch $_dh_action-] {+defaults
>/dev/null+} || init_script_error
[-fi-]
No differences were encountered between the postrm files
Prerm files: lines which differ (wdiff format)
----------------------------------------------
[-# Automatically added by dh_installinit-]
[-if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then-]
[-else-]
[- /etc/init.d/openvswitch-switch stop || init_script_error-]
[- fi-]
[-# End automatically added section-]
================= openvswitch-test_1.5.90-1_all.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
No differences were encountered between the postinst files
No differences were encountered between the preinst files
No differences were encountered between the prerm files
================= ovsdbmonitor_1.5.90-1_all.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
================= python-openvswitch_1.5.90-1_all.deb ==============
File lists identical (after any substitutions)
No differences were encountered between the control files
No differences were encountered between the postinst files
No differences were encountered between the preinst files
No differences were encountered between the prerm files
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
