diff options
| -rw-r--r-- | debian/NetworkManager.conf (renamed from debian/nm-system-settings.conf) | 0 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/network-manager.install | 2 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 84 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 42 |
5 files changed, 88 insertions, 48 deletions
diff --git a/debian/nm-system-settings.conf b/debian/NetworkManager.conf index d8b33d91..d8b33d91 100644 --- a/debian/nm-system-settings.conf +++ b/debian/NetworkManager.conf diff --git a/debian/changelog b/debian/changelog index 0f03e480..0519f46b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (0.8.1-2) UNRELEASED; urgency=low + + * Move configuration file /etc/NetworkManager/nm-system-settings.conf to + /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move + the conffile without triggering a dpkg prompt. + + -- Michael Biebl <biebl@debian.org> Fri, 30 Jul 2010 01:53:34 +0200 + network-manager (0.8.1-1) unstable; urgency=low * New upstream release. (Closes: #590139) diff --git a/debian/network-manager.install b/debian/network-manager.install index 46061932..dbe43cfa 100644 --- a/debian/network-manager.install +++ b/debian/network-manager.install @@ -17,5 +17,5 @@ debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf debian/tmp/etc/NetworkManager/dispatcher.d/ debian/tmp/etc/NetworkManager/system-connections/ -debian/nm-system-settings.conf etc/NetworkManager/ debian/tmp/lib/udev/rules.d/*.rules +debian/NetworkManager.conf etc/NetworkManager/ diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 47d06d42..fe0afb36 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -18,49 +18,63 @@ set -e # If prerm fails during replacement due to conflict: # <postinst> abort-remove in-favour <new-package> <version> +# Move a conffile without triggering a dpkg question +mv_conffile() { + local OLDCONFFILE="$1" + local NEWCONFFILE="$2" + + [ -e "$OLDCONFFILE" ] || return 0 + + echo "Preserving user changes to $NEWCONFFILE ..." + mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new + mv -f "$OLDCONFFILE" "$NEWCONFFILE" +} case "$1" in configure) - - if ! getent group netdev > /dev/null; then - addgroup --quiet --system netdev - fi - - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi - - # Stop the service on upgrades before it is started again. - # dh_installinit -r will create the start code. - if [ -n "$2" ]; then - if [ -x "/etc/init.d/network-manager" ]; then - invoke-rc.d network-manager stop || true - fi - fi - - # Update init script priorities - if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then - for i in 0 1 6 ; do - if [ -e /etc/rc$i.d/K14network-manager ]; then - mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager - fi - done - fi - - # Kill nm-system-settings service as in 0.8 it is no longer a separate process - if dpkg --compare-versions "$2" lt "0.7.999-1"; then - kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true - fi - - ;; + + if ! getent group netdev > /dev/null; then + addgroup --quiet --system netdev + fi + + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + + # Stop the service on upgrades before it is started again. + # dh_installinit -r will create the start code. + if [ -n "$2" ]; then + if [ -x "/etc/init.d/network-manager" ]; then + invoke-rc.d network-manager stop || true + fi + fi + + # Update init script priorities + if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then + for i in 0 1 6 ; do + if [ -e /etc/rc$i.d/K14network-manager ]; then + mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager + fi + done + fi + + # Kill nm-system-settings service as in 0.8 it is no longer a separate process + if dpkg --compare-versions "$2" lt "0.7.999-1"; then + kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true + fi + + if dpkg --compare-versions "$2" lt "0.8.1-2"; then + mv_conffile "/etc/NetworkManager/nm-system-setttings.conf" "/etc/NetworkManager/NetworkManager.conf" + fi + ;; abort-upgrade|abort-deconfigure|abort-remove) - ;; + ;; *) echo "$0 called with unknown argument \`$1'" 1>&2 - exit 1 - ;; + exit 1 + ;; esac #DEBHELPER# diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 445c05ca..114ced74 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -18,26 +18,41 @@ set -e # <old-preinst> abort-upgrade <new-version> -# remove a no-longer used conffile +# Remove a no-longer used conffile rm_conffile() { PKGNAME="$1" CONFFILE="$2" - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi + [ -e "$CONFFILE" ] || return 0 + + local md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + local old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | \ + sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" fi } +# Prepare to move a conffile without triggering a dpkg question +prep_mv_conffile() { + local PKGNAME="$1" + local CONFFILE="$2" + + [ -e "$CONFFILE" ] || return 0 + + local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')" + local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \ + sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")" + if [ "$md5sum" = "$old_md5sum" ]; then + rm -f "$CONFFILE" + fi +} case "$1" in install|upgrade) @@ -70,6 +85,9 @@ case "$1" in if dpkg --compare-versions "$2" lt "0.7.999-1"; then rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf fi + if dpkg --compare-versions "$2" lt "0.8.1-2"; then + prep_mv_conffile network-manager /etc/NetworkManager/nm-system-settings.conf + fi ;; abort-upgrade) |