diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2008-07-08 23:09:51 +0000 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2008-07-08 23:09:51 +0000 |
| commit | 79d3217cc0bd83cb484790ae98bc8e2d15bdabfc (patch) | |
| tree | 7a1f31dcb40222a01c47171116bd23febf9e7adc /ezjail-admin | |
| parent | 55d085e07061717b5193a9911652b93e52c088e1 (diff) | |
Direct find to 'find .' instead of 'find *' to allow for dot-files to be found and too many parameters never to occur
Diffstat (limited to 'ezjail-admin')
| -rwxr-xr-x | ezjail-admin | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ezjail-admin b/ezjail-admin index 7121d2d..94cba9e 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
| @@ -211,7 +211,7 @@ ezjail_splitworld() { | |||
| 211 | 211 | ||
| 212 | # The ugly perl hack[tm]. Note: we wont do such things for any given | 212 | # The ugly perl hack[tm]. Note: we wont do such things for any given |
| 213 | # port :( | 213 | # port :( |
| 214 | [ "${ezjail_uglyperlhack}" = "YES" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" | 214 | [ "${ezjail_uglyperlhack}" -a ! -L "${ezjail_jailbase}/usr/bin/perl" ] && ln -s /usr/local/bin/perl "${ezjail_jailbase}/usr/bin/perl" |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | # The user may want to have a ports tree in basejail | 217 | # The user may want to have a ports tree in basejail |
| @@ -479,7 +479,7 @@ create) | |||
| 479 | [ $? -eq 0 ] || detach_images || exerr "Error: Could not extract archive from ${ezjail_fromarchive}." | 479 | [ $? -eq 0 ] || detach_images || exerr "Error: Could not extract archive from ${ezjail_fromarchive}." |
| 480 | elif [ -z "${ezjail_exists}" ]; then | 480 | elif [ -z "${ezjail_exists}" ]; then |
| 481 | # now take a copy of our template jail | 481 | # now take a copy of our template jail |
| 482 | mkdir -p "${ezjail_rootdir}" && cd "${ezjail_jailtemplate}" && find * | cpio -p -v "${ezjail_rootdir}" > /dev/null | 482 | mkdir -p "${ezjail_rootdir}" && cd "${ezjail_jailtemplate}" && find . | cpio -p -v "${ezjail_rootdir}" > /dev/null |
| 483 | [ $? -eq 0 ] || detach_images || exerr "Error: Could not copy template jail." | 483 | [ $? -eq 0 ] || detach_images || exerr "Error: Could not copy template jail." |
| 484 | fi | 484 | fi |
| 485 | 485 | ||
| @@ -522,7 +522,7 @@ create) | |||
| 522 | # Final steps for flavour installation | 522 | # Final steps for flavour installation |
| 523 | if [ -z "${ezjail_exists}" -a "${ezjail_flavour}" ]; then | 523 | if [ -z "${ezjail_exists}" -a "${ezjail_flavour}" ]; then |
| 524 | # install files and config to new jail | 524 | # install files and config to new jail |
| 525 | cd "${ezjail_flavours}/${ezjail_flavour}" && find * | cpio -p -u -v "${ezjail_rootdir}" > /dev/null | 525 | cd "${ezjail_flavours}/${ezjail_flavour}" && find . | cpio -p -u -v "${ezjail_rootdir}" > /dev/null |
| 526 | [ $? -eq 0 ] || echo "Warning: Could not fully install flavour." | 526 | [ $? -eq 0 ] || echo "Warning: Could not fully install flavour." |
| 527 | 527 | ||
| 528 | # if the packages are links and not files we have to copy them now | 528 | # if the packages are links and not files we have to copy them now |
| @@ -673,7 +673,7 @@ setup|update) | |||
| 673 | fi # installaction="none" | 673 | fi # installaction="none" |
| 674 | 674 | ||
| 675 | # Provide a copy of ports tree in basejail | 675 | # Provide a copy of ports tree in basejail |
| 676 | [ "${ezjail_provideports}" = "YES" ] && ezjail_updateports | 676 | [ "${ezjail_provideports}" ] && ezjail_updateports |
| 677 | 677 | ||
| 678 | ;; | 678 | ;; |
| 679 | ######################## ezjail-admin INSTALL ######################## | 679 | ######################## ezjail-admin INSTALL ######################## |
| @@ -759,7 +759,7 @@ install) | |||
| 759 | ezjail_splitworld | 759 | ezjail_splitworld |
| 760 | 760 | ||
| 761 | # Fill ports, if requested | 761 | # Fill ports, if requested |
| 762 | [ "${ezjail_installports}" = "YES" ] && ezjail_updateports | 762 | [ "${ezjail_installports}" ] && ezjail_updateports |
| 763 | 763 | ||
| 764 | ;; | 764 | ;; |
| 765 | ######################## ezjail-admin SHORTCUT ######################## | 765 | ######################## ezjail-admin SHORTCUT ######################## |
