Changeset 16537 in niluje


Ignore:
Timestamp:
Oct 7, 2019, 6:08:57 PM (11 days ago)
Author:
NiLuJe
Message:

Kindle Touch Hacks:

  • Bridge:
    • Make sure we do the right thing if ROOT ought to be set (i.e., running from diags).
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Configs/trunk/Kindle/Touch_Hacks/JailBreak/src/bridge.sh

    r16536 r16537  
    5252}
    5353
    54 mount_root_rw()
    55 {
     54find_rootfs()
     55{
     56        # We need to know our model first...
     57        check_model
     58
    5659        # Handle the fact that the KOA2 switched to an all-new partition layout (àla Android)
    5760        # NOTE: For some mysterious reason, rdev's output doesn't match what we can get from the elektra db via:
     
    7376        if [ "${DEV}" != "/dev/${ROOTPART}" -a -n "${DEV}" ] ; then
    7477                ROOT="/var/tmp/rootfs"
     78        fi
     79}
     80
     81mount_root_rw()
     82{
     83        # Make sure we use the right rootfs ;p
     84        find_rootfs
     85
     86        if [ -n "${ROOT}" ] ; then
    7587                logmsg "I" "mount_root_rw" "" "Running from diags, mounting main rootfs ${ROOTPART} on ${ROOT}"
    7688                mkdir -p "${ROOT}"
     
    418430install_touch_update_key()
    419431{
    420         # We need to know our model to handle different partition layouts
    421         check_model
    422 
    423432        mount_root_rw
    424433        logmsg "I" "install_touch_update_key" "" "Copying the jailbreak updater key"
     
    494503install_mkk_kindlet_jb()
    495504{
    496         # We need to know our model to handle different partition layouts
    497         check_model
    498 
    499505        mount_root_rw
    500506        logmsg "I" "install_mkk_kindlet_jb" "" "Copying the kindlet jailbreak"
     
    520526install_rp()
    521527{
    522         # We need to know our model to handle different partition layouts
    523         check_model
    524 
    525528        mount_root_rw
    526529        logmsg "I" "install_rp" "" "Copying the RP"
     
    537540install_crp()
    538541{
    539         # We need to know our model to handle different partition layouts
    540         check_model
    541 
    542542        mount_root_rw
    543543        logmsg "I" "install_crp" "" "Copying the CRP"
     
    557557install_dispatch()
    558558{
    559         # We need to know our model to handle different partition layouts
    560         check_model
    561 
    562559        mount_root_rw
    563560        logmsg "I" "install_dispatch" "" "Copying the dispatch script"
     
    572569install_bridge_job()
    573570{
    574         # We need to know our model to handle different partition layouts
    575         check_model
    576 
    577571        mount_root_rw
    578572        logmsg "I" "install_bridge_job" "" "Copying the bridge job"
     
    593587        fi
    594588}
     589
     590# We'll begin by checking where our rootfs is...
     591find_rootfs
     592
     593# And if we're in diags, we'll need to mount it first, otherwise all those ${ROOT} checks will be useless ;).
     594if [ -n "${ROOT}" ] ; then
     595        mount_root_rw
     596fi
    595597
    596598# Start with the userstore exec flag on FW >= 5.4 (so that the last eips print shown will make sense)
Note: See TracChangeset for help on using the changeset viewer.