diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-06-25 20:23:02 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-06-25 20:23:02 (EDT) |
| commit | 3548a44db1df9a8f2312cd1a5323464dada6f6c2 (patch) | |
| tree | 22b96fbe7586092005f31e5230d1121e4c5f92c6 | |
| parent | c773de28b221c85159e4a715abd25ae7c39bc39c (diff) | |
session_begin(): Drop atexit parameter
| -rw-r--r-- | src/cmd/build.sh | 3 | ||||
| -rw-r--r-- | src/cmd/opkg.sh | 2 | ||||
| -rw-r--r-- | src/cmd/shell.sh | 2 | ||||
| -rw-r--r-- | src/opkg.sh | 2 | ||||
| -rw-r--r-- | src/session.sh | 5 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/cmd/build.sh b/src/cmd/build.sh index 4679bc4..f768cba 100644 --- a/src/cmd/build.sh +++ b/src/cmd/build.sh @@ -135,8 +135,7 @@ cmd_build_main() fi package_set_substvars "${arch}" "${plat}" - if ! session_begin "${root}" "${cmd_build_pkg_dir}" _cmd_build_fini \ - false; then + if ! session_begin "${root}" "${cmd_build_pkg_dir}" false; then _cmd_build_fini [ "x${dev}" != 'x' ] && block_umount "${root}" return 2 diff --git a/src/cmd/opkg.sh b/src/cmd/opkg.sh index 8444b3b..6a21f5f 100644 --- a/src/cmd/opkg.sh +++ b/src/cmd/opkg.sh @@ -98,7 +98,7 @@ cmd_opkg_main() return 2 fi - if ! session_begin "${root}" . _cmd_opkg_fini false; then + if ! session_begin "${root}" . false; then _cmd_opkg_fini [ "x${dev}" != 'x' ] && block_umount "${root}" return 2 diff --git a/src/cmd/shell.sh b/src/cmd/shell.sh index 2cc53ad..c49a57e 100644 --- a/src/cmd/shell.sh +++ b/src/cmd/shell.sh @@ -45,7 +45,7 @@ cmd_shell_main() return 2 fi - if ! session_begin "${root}" . : false; then + if ! session_begin "${root}" . false; then [ "x${dev}" != 'x' ] && block_umount "${root}" return 2 fi diff --git a/src/opkg.sh b/src/opkg.sh index 9b5af55..d801309 100644 --- a/src/opkg.sh +++ b/src/opkg.sh @@ -24,7 +24,7 @@ opkg_install_all() shift 1 local es= - session_begin "${root}" . : true + session_begin "${root}" . true es=0 session_exec /bin/sh -c \ 'opkg install $(opkg list-installed | cut -d " " -f 1)' || \ diff --git a/src/session.sh b/src/session.sh index c646a41..c5a78ea 100644 --- a/src/session.sh +++ b/src/session.sh @@ -131,9 +131,8 @@ session_begin() { local root="${1}" local mountdir="${2}" - local atexit="${3}" - local installing="${4}" - shift 4 + local installing="${3}" + shift 3 rand _session_id=${rand_x} |