Merge openembedded@openembedded.bkbits.net:packages-devel

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/20 15:58:56-06:00 ti.com!kergoth
initscripts: kill off extractfs, which was never actually symlinked for execution anyway, and which is deprecated in favor of the 'populate-var' script.

BKrev: 419fbe218B0Sv67-RMFZ_yACHBC-iQ

diff --git a/initscripts/initscripts-1.0/extractfs b/initscripts/initscripts-1.0/extractfs
deleted file mode 100644 (file)
index e5fa4e2..0000000
--- a/initscripts/initscripts-1.0/extractfs
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-. /etc/default/rcS
-
-set -e
-
-if (grep -q 'ramfs.*/var.*ramfs' /proc/mounts) || (grep -q 'tmpfs.*/var.*tmpfs' /proc/mounts)
-then
-       if test "$VERBOSE" != "no"; then echo -n "Populating /var filesystem: "; fi
-       cd /
-       tar -xpf /boot/var.tar
-       if test $? -ne 0; then
-               if test "$VERBOSE" != "no"; then echo "failed"; fi
-       else
-               if test "$VERBOSE" != "no"; then echo "done"; fi
-       fi
-fi
-
-# Sharp ROM compatibility links
-if ! [ -e /home/QtPalmtop ]; then
-       ln -sf /opt/QtPalmtop /home/QtPalmtop
-fi
-
-if ! [ -e /home/root ]; then
-       ln -sf /root /home/root
-fi
-
-exit 0

diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe
index c864b15..a4f966f 100644 (file)
--- a/initscripts/initscripts_1.0.oe
+++ b/initscripts/initscripts_1.0.oe
@@ -5,7 +5,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r18"
+PR = "r19"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -25,7 +25,6 @@ SRC_URI = "file://halt \
            file://sendsigs \
            file://urandom \
            file://rmnologin \
-           file://extractfs \
            file://checkroot.sh \
            file://umountnfs.sh \
            file://sysfs.sh \
@@ -69,7 +68,6 @@ do_install () {
 #
        install -m 0755 ${WORKDIR}/banner       ${D}/etc/init.d/banner
        install -m 0755 ${WORKDIR}/devices      ${D}/etc/init.d/devices
-       install -m 0755 ${WORKDIR}/extractfs    ${D}/etc/init.d/extractfs
        install -m 0755 ${WORKDIR}/umountfs     ${D}/etc/init.d/umountfs
 #
 # Create runlevel links
@@ -93,7 +91,6 @@ do_install () {
        ln -sf          ../init.d/checkroot.sh  ${D}/etc/rcS.d/S10checkroot.sh
 #      ln -sf          ../init.d/checkfs.sh    ${D}/etc/rcS.d/S30checkfs.sh
        ln -sf          ../init.d/mountall.sh   ${D}/etc/rcS.d/S35mountall.sh
-#      ln -sf          ../init.d/extractfs     ${D}/etc/rcS.d/S36extractfs
        ln -sf          ../init.d/hostname.sh   ${D}/etc/rcS.d/S40hostname.sh
        ln -sf          ../init.d/mountnfs.sh   ${D}/etc/rcS.d/S45mountnfs.sh
        ln -sf          ../init.d/bootmisc.sh   ${D}/etc/rcS.d/S55bootmisc.sh