diff options
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r-- | meta/recipes-core/base-files/base-files/profile | 6 | ||||
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index e14cb2d878..9e4283e0c7 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile | |||
@@ -24,11 +24,7 @@ fi | |||
24 | # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which tries do | 24 | # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which tries do |
25 | # use ssh | 25 | # use ssh |
26 | case $(tty 2>/dev/null) in | 26 | case $(tty 2>/dev/null) in |
27 | # The first invocation of resize verifies that it exists, the second | 27 | /dev/tty[A-z]*) [ -x @BINDIR@/resize ] && @BINDIR@/resize >/dev/null;; |
28 | # does the actual resizing. This is due to that resize uses stderr to | ||
29 | # determine the size of the tty, which does not work if it is redirected | ||
30 | # to /dev/null. | ||
31 | /dev/tty[A-z]*) resize >/dev/null 2>&1 && resize >/dev/null;; | ||
32 | esac | 28 | esac |
33 | 29 | ||
34 | export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM | 30 | export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM |
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 1c0863b1c7..05c0562661 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -121,6 +121,7 @@ do_install () { | |||
121 | install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd | 121 | install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd |
122 | install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile | 122 | install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile |
123 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile | 123 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile |
124 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile | ||
124 | install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells | 125 | install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells |
125 | install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile | 126 | install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile |
126 | install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc | 127 | install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc |