maintenance-scripts.patch

   1 diff --git a/package/debian/nosh-desktop-bus-shims.post_remove.extra b/package/debian/nosh-desktop-bus-shims.post_remove.extra
   2 index b4d175a..66687db 100644
   3 --- a/package/debian/nosh-desktop-bus-shims.post_remove.extra
   4 +++ b/package/debian/nosh-desktop-bus-shims.post_remove.extra
   5 @@ -1,4 +1,5 @@
   6  # Extra post-remove for nosh-desktop-bus-shims
   7  # vim: set filetype=sh:
   8
   9 -dpkg-divert --package nosh-desktop-bus-shims --remove --rename /usr/lib/dbus-1.0/dbus-daemon-launch-helper
  10 +#dpkg-divert --package nosh-desktop-bus-shims --remove --rename /usr/lib/dbus-1.0/dbus-daemon-launch-helper
  11 +echo "Please reinstall core/dbus in order to replace its dbus-daemon-launch-helper"
  12 diff --git a/package/debian/nosh-desktop-bus-shims.pre_install.extra b/package/debian/nosh-desktop-bus-shims.pre_install.extra
  13 index a5e205e..646df17 100644
  14 --- a/package/debian/nosh-desktop-bus-shims.pre_install.extra
  15 +++ b/package/debian/nosh-desktop-bus-shims.pre_install.extra
  16 @@ -1,4 +1,5 @@
  17  # Extra pre-install for nosh-desktop-bus-shims
  18  # vim: set filetype=sh:
  19
  20 -dpkg-divert --package nosh-desktop-bus-shims --add --rename /usr/lib/dbus-1.0/dbus-daemon-launch-helper
  21 +#dpkg-divert --package nosh-desktop-bus-shims --add --rename /usr/lib/dbus-1.0/dbus-daemon-launch-helper
  22 +mv -v /usr/lib/dbus-1.0/dbus-daemon-launch-helper /usr/lib/dbus-1.0/dbus-daemon-launch-helper.old
  23 diff --git a/package/debian/nosh-desktop-bus-shims.pre_upgrade.extra b/package/debian/nosh-desktop-bus-shims.pre_upgrade.extra
  24 index 39e31aa..f4081ad 100644
  25 --- a/package/debian/nosh-desktop-bus-shims.pre_upgrade.extra
  26 +++ b/package/debian/nosh-desktop-bus-shims.pre_upgrade.extra
  27 @@ -1,4 +1,5 @@
  28  # Extra pre-upgrade for nosh-desktop-bus-shims
  29  # vim: set filetype=sh:
  30
  31 -dpkg-divert --package nosh-desktop-bus-shims --add --rename /usr/lib/dbus-1.0/dbus-daemon-launch-helper
  32 +#dpkg-divert --package nosh-desktop-bus-shims --add --rename /usr/lib/dbus-1.0/dbus-daemon-launch-helper
  33 +mv -v /usr/lib/dbus-1.0/dbus-daemon-launch-helper /usr/lib/dbus-1.0/dbus-daemon-launch-helper.old
  34 diff --git a/package/debian/nosh-run-system-manager.post_install.extra b/package/debian/nosh-run-system-manager.post_install.extra
  35 index 25c03dd..c3a9b47 100644
  36 --- a/package/debian/nosh-run-system-manager.post_install.extra
  37 +++ b/package/debian/nosh-run-system-manager.post_install.extra
  38 @@ -1,12 +1,9 @@
  39  # Extra post-install for nosh-run-system-manager
  40  # vim: set filetype=sh:
  41
  42 -if test -z "$2"                # No prior version installed/left configured.
  43 -then
  44         for i in - -usr -var -home
  45         do
  46                 /bin/rm -f -r /etc/service-bundles/services/fsck@$i/
  47                 /bin/rm -f -r /etc/service-bundles/services/mount@$i/
  48         done
  49 -fi
  50  redo -C /etc/system-control/convert all
  51 diff --git a/package/debian/nosh-run-system-manager.post_upgrade.extra b/package/debian/nosh-run-system-manager.post_upgrade.extra
  52 index 1fce0b2..4c1e018 100644
  53 --- a/package/debian/nosh-run-system-manager.post_upgrade.extra
  54 +++ b/package/debian/nosh-run-system-manager.post_upgrade.extra
  55 @@ -1,12 +1,9 @@
  56  # Extra post-upgrade for nosh-run-system-manager
  57  # vim: set filetype=sh:
  58
  59 -if test -z "$2"                # No prior version installed/left configured.
  60 -then
  61         for i in - -usr -var -home
  62         do
  63                 /bin/rm -f -r /etc/service-bundles/services/fsck@$i/
  64                 /bin/rm -f -r /etc/service-bundles/services/mount@$i/
  65         done
  66 -fi
  67  redo -C /etc/system-control/convert all