diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-22 15:47:12 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-22 15:47:12 +0000 |
| commit | f3c74f6b708586d0a996daae1fa8b5ffa3b25cb6 (patch) | |
| tree | 4df47bc9923d49a4c61d724f8f918e7d6811a696 /packages/initscripts | |
| parent | bcbaf180430454102b5105e21f5db1e83596ab7b (diff) | |
| parent | 3d947531d6e2a313b6e68631c93e50dc9b956b96 (diff) | |
merge of '2df98cb93e1c3ab67c675e3f11ef036ea57dd19b'
and 'ba9a800ebd8fd6f90db1e022cd9a342c69339bc2'
Diffstat (limited to 'packages/initscripts')
| -rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/alignment.sh | 2 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/bootclean.sh | 4 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/initscripts/initscripts-1.0/slugos/alignment.sh b/packages/initscripts/initscripts-1.0/slugos/alignment.sh index bf193cb01c..52e43cc0c5 100644 --- a/packages/initscripts/initscripts-1.0/slugos/alignment.sh +++ b/packages/initscripts/initscripts-1.0/slugos/alignment.sh @@ -14,7 +14,7 @@ # Set ALIGN in /etc/default/rcS to override (do not edit this # file!) Set ALIGN to empty to avoid changing the kernel # default (currently '0'). -ALIGN=1 +ALIGN=3 . /etc/default/rcS test -e /proc/cpu/alignment -a -n "$ALIGN" -a "$ALIGN" -ge 0 -a "$ALIGN" -lt 6 && echo "$ALIGN" >/proc/cpu/alignment diff --git a/packages/initscripts/initscripts-1.0/slugos/bootclean.sh b/packages/initscripts/initscripts-1.0/slugos/bootclean.sh index 1304cb3794..3b17d6d617 100644 --- a/packages/initscripts/initscripts-1.0/slugos/bootclean.sh +++ b/packages/initscripts/initscripts-1.0/slugos/bootclean.sh @@ -16,8 +16,8 @@ if [ -d /tmp -a ! -L /tmp ] ; then echo "bootclean.sh: Cleaning /tmp..." cd /tmp || { echo "bootclean.sh: unable to cd to /tmp." ; return 1 ; } - find . -depth -xdev ! -type d -print0 | xargs -0r rm -f -- - find . -depth -xdev -type d ! -name . -empty -exec rmdir \{\} \; + find . -xdev ! -type d -print0 | xargs -0r rm -f -- + find . -depth -xdev -type d ! -name . -exec rmdir \{\} \; else echo "bootclean.sh: Skipping /tmp (not a directory)..." fi diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 0608db714d..242a55ad7a 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -10,7 +10,7 @@ RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.12" +PR := "${PR}.13" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" |