Merge remote-tracking branch 'oe21/master' into vuplus-3.0

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-core / initscripts / initscripts_1.0.bbappend

diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
index 4222808..2ea8e9a 100644 (file)
--- a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,16 +1,18 @@
-PR .= "-vuplus1"
+PR .= "-vuplus10"
 
-#BOOTUP = "${@base_contains('PREFERRED_VERSION_linux-vuplus', '3.1.1', 'bootup_3.1', ' ', d)}"
-#BOOTUP_vusolo2 = "${@base_contains('PREFERRED_VERSION_linux-vuplus', '3.3.6', 'bootup_3.1', ' ', d)}"
-BOOTUP = "bootup_3.1" 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 SRC_URI_append = " \
        file://turnoff_power \
        file://hotplug_br \
        file://make_mac_sector \
-       file://${BOOTUP} \
+       file://mountrun.sh \
 "
 
+do_configure_prepend() {
+        sed -i 's/tty0/ttyS0/' ${WORKDIR}/banner.sh
+}
+
 do_install_append() {
        rm ${D}${sysconfdir}/*.d/*save-rtc.sh
 
@@ -18,8 +20,13 @@ do_install_append() {
        install -m 0755 ${WORKDIR}/turnoff_power     ${D}/usr/bin
        install -m 0755 ${WORKDIR}/hotplug_br        ${D}/usr/bin
        install -m 0755 ${WORKDIR}/make_mac_sector   ${D}/usr/bin
-       install -m 0755 ${WORKDIR}/${BOOTUP}         ${D}${sysconfdir}/init.d/bootup
-       ln      -sf     ../init.d/bootup             ${D}${sysconfdir}/rcS.d/S05bootup
+
+       install -m 0755 ${WORKDIR}/mountrun.sh ${D}${sysconfdir}/init.d
+        ln -s ../init.d/mountrun.sh ${D}${sysconfdir}/rcS.d/S02mountrun.sh
+
+       # rename umountnfs script because it should run before network is disabled
+        mv ${D}${sysconfdir}/rc0.d/S31umountnfs.sh ${D}${sysconfdir}/rc0.d/K31umountnfs.sh || /bin/true
+        mv ${D}${sysconfdir}/rc6.d/S31umountnfs.sh ${D}${sysconfdir}/rc6.d/K31umountnfs.sh || /bin/true
 }
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"