diff options
| author | Roy Marples <roy@marples.name> | 2008-04-30 16:44:29 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-04-30 16:44:29 +0000 |
| commit | bdaca0baf5a87eb816cfc6de568839cfaf5db48b (patch) | |
| tree | 59fcad0a738349d6f100c959125b4152f6cd7e38 /init.d | |
| parent | 5188fd25927598ee63e46d7ff15e67571b13dacb (diff) | |
Busybox find now works with -exec correctly, so remove our nasty hack.
Diffstat (limited to 'init.d')
| -rw-r--r-- | init.d/.gitignore | 8 | ||||
| -rw-r--r-- | init.d/bootmisc.in | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/init.d/.gitignore b/init.d/.gitignore index 10872127..6c61405f 100644 --- a/init.d/.gitignore +++ b/init.d/.gitignore @@ -30,3 +30,11 @@ net.lo ttys swap-blk wscons +consolefont +hwclock +keymaps +modules +mtab +numlock +procfs +termencoding diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in index 419a19c5..7a9e22f3 100644 --- a/init.d/bootmisc.in +++ b/init.d/bootmisc.in @@ -28,13 +28,8 @@ cleanup_tmp_dir() cd "${dir}" if yesno ${wipe_tmp:-${WIPE_TMP:-yes}}; then ebegin "Wiping ${dir} directory" - local startopts="-x . -depth" delete="-exec rm -rf -- {} ;" - - if [ "${RC_UNAME}" = "Linux" ]; then - startopts=". -xdev -depth" - # busybox find / rm cannot handle -- - delete="-delete" - fi + local startopts="-x . -depth" + [ "${RC_UNAME}" = "Linux" ] && startopts=". -xdev -depth" # Faster than find rm -rf -- [b-ikm-pr-zA-Z0-9\.]* @@ -54,8 +49,7 @@ cleanup_tmp_dir() ! -path "./journal/*" \ ! -path "./.private" \ ! -path "./.private/*" \ - ${delete} \ - -type d -prune + -exec rm -rf {} \; eend 0 else ebegin "Cleaning ${dir} directory" |