diff options
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 6 | ||||
-rwxr-xr-x | meta/recipes-core/sysvinit/sysvinit/rc | 1 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/rcS-default | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 44f0007daf..59e1e3f194 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -102,6 +102,10 @@ do_install_append() { | |||
102 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 102 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
103 | install -d ${D}${sysconfdir}/init.d/ | 103 | install -d ${D}${sysconfdir}/init.d/ |
104 | install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh | 104 | install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh |
105 | |||
106 | # make fifo for psplash | ||
107 | install -d ${D}/mnt | ||
108 | mkfifo ${D}/mnt/psplash_fifo | ||
105 | fi | 109 | fi |
106 | 110 | ||
107 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 111 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
@@ -122,3 +126,5 @@ SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'pspl | |||
122 | 126 | ||
123 | INITSCRIPT_NAME = "psplash.sh" | 127 | INITSCRIPT_NAME = "psplash.sh" |
124 | INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." | 128 | INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." |
129 | |||
130 | FILES_${PN} += "/mnt" | ||
diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc index c9f6558115..8e76f987c1 100755 --- a/meta/recipes-core/sysvinit/sysvinit/rc +++ b/meta/recipes-core/sysvinit/sysvinit/rc | |||
@@ -175,6 +175,5 @@ startup() { | |||
175 | if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then | 175 | if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then |
176 | if type psplash-write >/dev/null 2>&1; then | 176 | if type psplash-write >/dev/null 2>&1; then |
177 | psplash-write "QUIT" || true | 177 | psplash-write "QUIT" || true |
178 | umount -l /mnt/.psplash | ||
179 | fi | 178 | fi |
180 | fi | 179 | fi |
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS-default b/meta/recipes-core/sysvinit/sysvinit/rcS-default index c576ff0678..76af22b359 100644 --- a/meta/recipes-core/sysvinit/sysvinit/rcS-default +++ b/meta/recipes-core/sysvinit/sysvinit/rcS-default | |||
@@ -31,4 +31,4 @@ ROOTFS_READ_ONLY=no | |||
31 | # need to have specific behavior depending on init system | 31 | # need to have specific behavior depending on init system |
32 | INIT_SYSTEM=sysvinit | 32 | INIT_SYSTEM=sysvinit |
33 | # set the psplash fifo directory | 33 | # set the psplash fifo directory |
34 | PSPLASH_FIFO_DIR=/mnt/.psplash | 34 | PSPLASH_FIFO_DIR=/mnt |