diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-15 15:13:26 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-16 15:23:00 +0200 |
| commit | d28e842fedff8e1298b975f4b02c69b5bc5920a1 (patch) | |
| tree | 6a843cc2b5190ad1eaa94b59f2aa7bd7c877ed6a /scripts | |
| parent | a29b308f810b30591abbc03b00dbbf0ab7c9a7a5 (diff) | |
| download | ptxdist-d28e842fedff8e1298b975f4b02c69b5bc5920a1.tar.gz ptxdist-d28e842fedff8e1298b975f4b02c69b5bc5920a1.tar.xz | |
[ptxd_make_image_fix_permissions] get rid of cmd line option -p
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_image_fix_permissions.sh | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/scripts/lib/ptxd_make_image_fix_permissions.sh b/scripts/lib/ptxd_make_image_fix_permissions.sh index 54b2c1556..33a6914f5 100644 --- a/scripts/lib/ptxd_make_image_fix_permissions.sh +++ b/scripts/lib/ptxd_make_image_fix_permissions.sh @@ -35,7 +35,8 @@ ptxd_make_image_fix_permissions_check() { IFS=":" # just care about dev-nodes, for now - egrep "^[n]:" "${permfile}" | while read kind file uid_should gid_should prm_should type major_should minor_should; do + egrep -h "^[n]:" "${ptxd_reply_perm_files[@]}" | + while read kind file uid_should gid_should prm_should type major_should minor_should; do local fixup=false file="${workdir}/${file#/}" @@ -85,21 +86,13 @@ export -f ptxd_make_image_fix_permissions_check ptxd_make_image_fix_permissions() { ptxd_make_image_init || return - local permfile opt - - while getopts "p:r:" opt; do - case "$opt" in - p) - permfile="${OPTARG}" - ;; - *) - ;; - esac - done - local fixscript fixscript="$(mktemp "${PTXDIST_TEMPDIR}/fixpermissions.XXXXXXXXXX")" || ptxd_bailout "failed to create tempfile" - chmod +x "${fixscript}" + chmod +x "${fixscript}" && + + # get permission files + local -a ptxd_reply_ipkg_file ptxd_reply_perm_files && + ptxd_get_ipkg_files && set -- "${ptx_nfsroot}" "${ptx_nfsroot_dbg}" |