aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/ifupdown
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
committerCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
commit3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch)
tree642c13416b99e80f0871cdc6668e832e635dfb48 /recipes/ifupdown
parentc400c874f2ac9233b8a43a73309b6e7907289c54 (diff)
parent13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff)
downloadopenembedded-testing.tar.gz
openembedded-testing.tar.bz2
openembedded-testing.zip
Merge branch 'master' into testing-nexttested_2010-11-12testing
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.bb14
2 files changed, 27 insertions, 3 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 31e24d58be..04d687055c 100644
--- a/recipes/ifupdown/ifupdown_0.6.10.bb
+++ b/recipes/ifupdown/ifupdown_0.6.10.bb
@@ -4,7 +4,7 @@ configure (or, respectively, deconfigure) network interfaces, based on \
the file /etc/network/interfaces."
LICENSE = "GPL"
SECTION = "base"
-PR = "r2"
+PR = "r3"
SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz;name=ifupdown \
@@ -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"