Move interfaces example generation script to under

/usr/share/python-ifupdown2

Ticket: CM-2643
Reviewed By:
Testing Done: Tested ifupdown2 sanity

diff --git a/debian/python-ifupdown2.postinst b/debian/python-ifupdown2.postinst
index 2ded2b733b4cf576bc46dd9d4e395f202c871bfd..bff0a81369d2aab1de85254bbded0242b1330599 100644 (file)
--- a/debian/python-ifupdown2.postinst
+++ b/debian/python-ifupdown2.postinst
@@ -17,6 +17,8 @@ case "$1" in
             ln -sf /run/network /etc/network/run
         fi
 
+        ln -sf /usr/share/python-ifupdown2/generate_interfaces.py /usr/share/doc/python-ifupdown2/examples/generate_interfaces.py
+
         [ -d /etc/network/if-pre-up.d ] || mkdir -p /etc/network/if-pre-up.d
         [ -d /etc/network/if-up.d ] || mkdir -p /etc/network/if-up.d
         [ -d /etc/network/if-post-up.d ] || mkdir -p /etc/network/if-post-up.d
@@ -64,6 +66,7 @@ case "$1" in
     rm -f /sbin/ifquery
     rm -f /sbin/ifup
     rm -f /sbin/ifdown
+    rm -f /usr/share/doc/python-ifupdown2/generate_interfaces.py
     ;;
 esac
 

diff --git a/man.rst/ifup.8.rst b/man.rst/ifup.8.rst
index de764827f236b251e2ad2202ef6ad2c4e685cf69..7474d3e21130958afee3f269ca9f8b7be425d61f 100644 (file)
--- a/man.rst/ifup.8.rst
+++ b/man.rst/ifup.8.rst
@@ -153,4 +153,4 @@ SEE ALSO
     ifquery(8),
     ifreload(8),
     interfaces(5),
-    interfaces-addons(5)
+    ifupdownaddons-interfaces(5)

diff --git a/setup.py b/setup.py
index e148b1e2e8b9a2021d81071d95f46a7271f7a134..ca047424ea6d6075338d00e67a15f7fb1aabfd88 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,10 @@ setup(name='ifupdown2',
                   ('/sbin/', ['sbin/ifupdown']),
                   ('/etc/network/ifupdown2/',
                       ['config/ifupdown2.conf']),
+                  ('/usr/share/python-ifupdown2/',
+                      ['docs/examples/generate_interfaces.py']),
                   ('/usr/share/doc/python-ifupdown2/examples/',
-                      ['docs/examples/generate_interfaces.py',
-                       'docs/examples/interfaces',
+                      ['docs/examples/interfaces',
                        'docs/examples/interfaces_bridge_template_func',
                        'docs/examples/interfaces_with_template'])]
       )