aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/ifupdown
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2010-11-12 09:44:46 -0800
committerPhilip Balister <philip@opensdr.com>2010-11-12 09:44:46 -0800
commit752733779ad15cdcd499267dbb93e9e3b4259e77 (patch)
treec316ecc52ef9c3cb4f772edf981fa1f456b74671 /recipes/ifupdown
parent4138991b3de3d9919d3998c1c01ba6cb599b4640 (diff)
parentefeaa588b5ce08dee3b350f1aa1c8d588a817483 (diff)
downloadopenembedded-752733779ad15cdcd499267dbb93e9e3b4259e77.tar.gz
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/ifupdown')
-rw-r--r--recipes/ifupdown/ifupdown-ubuntu_0.6.8.bb16
-rw-r--r--recipes/ifupdown/ifupdown_0.6.10.bb12
2 files changed, 26 insertions, 2 deletions
diff --git a/recipes/ifupdown/ifupdown-ubuntu_0.6.8.bb b/recipes/ifupdown/ifupdown-ubuntu_0.6.8.bb
index 3c8de81a10..3cccdb2c18 100644
--- a/recipes/ifupdown/ifupdown-ubuntu_0.6.8.bb
+++ b/recipes/ifupdown/ifupdown-ubuntu_0.6.8.bb
@@ -8,7 +8,7 @@ SECTION = "base"
PROVIDES = "ifupdown"
-PR = "r2"
+PR = "r3"
inherit update-rc.d
@@ -39,7 +39,19 @@ do_install () {
install -m 0644 ifup.8 ${D}${mandir}/man8
install -m 0644 interfaces.5 ${D}${mandir}/man5
cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8
+ mv ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifup.${PN}
+ mv ${D}${base_sbindir}/ifdown ${D}${base_sbindir}/ifdown.${PN}
}
+
+pkg_postinst_${PN} () {
+ update-alternatives --install ${base_sbindir}/ifup ifup ifup.${PN} 100
+ update-alternatives --install ${base_sbindir}/ifdown ifdown ifdown.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+ update-alternatives --remove ifup ifup.${PN}
+ update-alternatives --remove ifdown ifdown.${PN}
+}
+
INITSCRIPT_NAME = "ifup"
INITSCRIPT_PARAMS = "start 39 S . stop 39 0 6 1 ."
-
diff --git a/recipes/ifupdown/ifupdown_0.6.10.bb b/recipes/ifupdown/ifupdown_0.6.10.bb
index 7e45dc6280..04d687055c 100644
--- a/recipes/ifupdown/ifupdown_0.6.10.bb
+++ b/recipes/ifupdown/ifupdown_0.6.10.bb
@@ -33,6 +33,18 @@ do_install () {
install -m 0644 ifup.8 ${D}${mandir}/man8
install -m 0644 interfaces.5 ${D}${mandir}/man5
cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8
+ mv ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifup.${PN}
+ mv ${D}${base_sbindir}/ifdown ${D}${base_sbindir}/ifdown.${PN}
+}
+
+pkg_postinst_${PN} () {
+ update-alternatives --install ${base_sbindir}/ifup ifup ifup.${PN} 100
+ update-alternatives --install ${base_sbindir}/ifdown ifdown ifdown.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+ update-alternatives --remove ifup ifup.${PN}
+ update-alternatives --remove ifdown ifdown.${PN}
}
INITSCRIPT_NAME = "ifup"