Changeset 12980


Ignorieren:
Zeitstempel:
01.03.2015 23:10:53 (vor 3 Jahren)
Autor:
er13
Nachricht:

fwmod:

  • replace busybox also in filesystem_core
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/fwmod

    r12979 r12980  
    10751075        echo0 "installing busybox" 
    10761076 
     1077        DIRS_BUSYBOX_TO_REPLACE_WITHIN="${FILESYSTEM_MOD_DIR}" 
     1078        [ "${FREETZ_AVM_HAS_UPDATE_FILESYSTEM_IMAGE}" == "y" ] && DIRS_BUSYBOX_TO_REPLACE_WITHIN+=" ${FILESYSTEM_CORE_MOD_DIR}" 
     1079 
    10771080        echo1 "replacing busybox" 
    10781081        [ ! -r "${PACKAGES_DIR}/busybox/busybox" ] && error 1 "cannot find busybox replacement" 
    1079         cp -pf "${PACKAGES_DIR}/busybox/busybox" "${FILESYSTEM_MOD_DIR}/bin/busybox" 
     1082        for d in ${DIRS_BUSYBOX_TO_REPLACE_WITHIN}; do cp -pf "${PACKAGES_DIR}/busybox/busybox" "${d}/bin/busybox"; done 
    10801083 
    10811084        echo1 "installing symlinks" 
     
    10841087        # Remove old busybox links 
    10851088        # be compatible: do not use -delete (not found in older versions of find) 
    1086         find "$FILESYSTEM_MOD_DIR" \( -lname "busybox" -or -lname "*/busybox" \) -print0 | xargs -0 rm 
     1089        find ${DIRS_BUSYBOX_TO_REPLACE_WITHIN} \( -lname "busybox" -or -lname "*/busybox" \) -print0 | xargs -0 rm 
    10871090 
    10881091        # Install new busybox links 
     
    11091112            esac 
    11101113 
    1111             ln -sf "$BUSYBOX_PATH" "${FILESYSTEM_MOD_DIR}${LINK_DIR}/$LINK_NAME" || 
    1112             error 1 "could not create link for $link" 
     1114            for d in ${DIRS_BUSYBOX_TO_REPLACE_WITHIN}; do 
     1115                mkdir -p "${d}${LINK_DIR}" 
     1116                ln -sf "$BUSYBOX_PATH" "${d}${LINK_DIR}/$LINK_NAME" || error 1 "could not create link for $link" 
     1117            done 
    11131118        done || exit 1 
    11141119    fi 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.