diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-12-03 18:36:33 (EST) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-12-03 18:36:33 (EST) |
| commit | 54379ea45c663dcc341343751206ccb583fefc41 (patch) | |
| tree | bfb3ac52dbb37af97dfe7d999bbdad92177e3b86 /lib | |
| parent | fd78b0f39a4a9d36ead598a1a6c2fa4d511bf2d2 (diff) | |
profile_configure_system_*(): Pass arch and plat
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cmd/install.sh | 4 | ||||
| -rw-r--r-- | lib/profile.sh | 8 | ||||
| -rw-r--r-- | lib/profile/proteanos.sh | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/cmd/install.sh b/lib/cmd/install.sh index d115b9c..ac817e0 100644 --- a/lib/cmd/install.sh +++ b/lib/cmd/install.sh @@ -113,9 +113,9 @@ cmd_install_main() info "$(get_msg 'cmd_install_configuring')" if ! ${foreign}; then - profile_configure_system_native "${chroot}" + profile_configure_system_native "${chroot}" "${arch}" "${plat}" else - profile_configure_system_foreign "${chroot}" + profile_configure_system_foreign "${chroot}" "${arch}" "${plat}" fi rm "${chroot}/prokit/installing" diff --git a/lib/profile.sh b/lib/profile.sh index 5ec2309..de2c6a1 100644 --- a/lib/profile.sh +++ b/lib/profile.sh @@ -158,13 +158,17 @@ profile_bind_umount() profile_configure_system_native() { local root="${1}" + local arch="${2}" + local plat="${3}" - "prof_${profile}_configure_system_native" "${root}" + "prof_${profile}_configure_system_native" "${root}" "${arch}" "${plat}" } profile_configure_system_foreign() { local root="${1}" + local arch="${2}" + local plat="${3}" - "prof_${profile}_configure_system_foreign" "${root}" + "prof_${profile}_configure_system_foreign" "${root}" "${arch}" "${plat}" } diff --git a/lib/profile/proteanos.sh b/lib/profile/proteanos.sh index df583ef..92cdf11 100644 --- a/lib/profile/proteanos.sh +++ b/lib/profile/proteanos.sh @@ -215,6 +215,8 @@ prof_proteanos_bind_umount() prof_proteanos_configure_system_native() { local root="${1}" + local arch="${2}" + local plat="${3}" printf 'disabled\n' >"${root}/etc/rc.policy" opkg_install_all "${root}" @@ -230,6 +232,8 @@ prof_proteanos_configure_system_native() prof_proteanos_configure_system_foreign() { local root="${1}" + local arch="${2}" + local plat="${3}" printf '%s' "${prof_proteanos_install_service}" >"${root}/etc/rc.d/S10install" chmod 0755 "${root}/etc/rc.d/S10install" |