diff options
| author | Mike Westerhof <mwester@dls.net> | 2009-01-25 00:22:59 -0600 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2009-01-25 00:22:59 -0600 |
| commit | b49e09758de7f29c049c12213347cb32fb64d7a4 (patch) | |
| tree | aa53ce0bf2a37e9bea305e8f83a16511c7947a92 /packages/initscripts/initscripts-slugos_1.0.bb | |
| parent | 1fb3bb6d4025793ef378c2cbe39f1af16c86131f (diff) | |
SlugOS: rename checkroot.sh to checkroot to avoid rcS "sourcing"
SlugOS checkroot script redirects I/O which does not play well
with the new "optimized" rcS behavior, which is to source any
init scripts ending in "sh".
Diffstat (limited to 'packages/initscripts/initscripts-slugos_1.0.bb')
| -rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 41b1e97d9d..ba1b97e024 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -16,7 +16,7 @@ RDEPENDS = "" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.16" +PR := "${PR}.17" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -26,18 +26,28 @@ SRC_URI += "file://alignment.sh" SRC_URI += "file://domainname.sh" SRC_URI += "file://devices.patch;patch=1" SRC_URI += "file://bootclean.sh" +SRC_URI += "file://checkroot" -# Without this it is not possible to patch checkroot.sh +# Without this it is not possible to patch checkroot S = "${WORKDIR}" do_install_append() { # the image build command now installs this for slugos rm ${D}${sysconfdir}/device_table + # Ugly - we need to get rid of the checkroot.sh + # that was installed by initscript-1.0.bb; the new + # rcS script will "source" files that end in .sh, + # and that messes up our checkroot.sh script (due + # to redirection issues. We need to use only our + # checkroot, without the ".sh" suffix. + rm -f ${D}${sysconfdir}/init.d/checkroot.sh + # slugos specific scripts install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/domainname.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootclean.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/checkroot ${D}${sysconfdir}/init.d # Remove the do install links (this detects a change to the # initscripts .bb file - it will cause a build failure here.) @@ -104,7 +114,7 @@ do_install_append() { # busybox hwclock.sh (slugos-init) starts here (08) # slugos-init umountinitrd runs here (09) - update-rc.d -r ${D} checkroot.sh start 10 S . + update-rc.d -r ${D} checkroot start 10 S . # slugos buffer syslog starts here (11) # sysconfsetup runs at S 12 # modutils.sh runs at S 20 |