1
0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00

Fix incorrect install location of networking default file

Ticket: none
Reviewed By: roopa,satish
Testing Done: built, installed, verified correct location

The install file resulted in creating /etc/default/networking/ as a
directory and installing the networking.default file in it.  Rename
networking.default to networking, and change the install file.
Normally dh_installinit handles all this, but since the package is
ifupdown2, and the file is networking, that doesn't happen.

Also, because we had created a directory with the name of what we want
to install as a file, we need to remove it if it exists.  This addition
of a preinst file should not go upstream, and should be removed in a few
weeks when everybody has re-installed enough.
This commit is contained in:
Dave Olson
2016-02-19 13:14:55 -08:00
parent 5e01fb8056
commit 8f79f54df8
3 changed files with 14 additions and 1 deletions

View File

@@ -1,3 +1,3 @@
sbin/ifupdown2 /usr/share/ifupdown2/
sbin/start-networking /sbin
debian/networking.default /etc/default/networking
debian/networking /etc/default/

13
debian/ifupdown2.preinst vendored Normal file
View File

@@ -0,0 +1,13 @@
#! /bin/sh
set -e
case "$1" in
install|upgrade)
# workaround 3.0.0 internal install error. This can be removed in a
# few weeks.
if [ -f /etc/default/networking/networking.default ]; then
dpkg-maintscript-helper rm_conffile /etc/default/networking/networking.default 1.1 -- $@
rm -rf /etc/default/networking
fi
;;
esac

View File