Changeset 14146


Ignorieren:
Zeitstempel:
14.03.2017 21:25:55 (vor 6 Wochen)
Autor:
er13
Nachricht:

197-add_freetzmount.sh:

  • apply changes fixing typos in AVM code unconditionally, i.e. regardless of whether FreetzMount is enabled or not
  • refs #2807
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/patches/scripts/197-add_freetzmount.sh

    r14145 r14146  
    1 echo1 "applying 'remove components'-part of FREETZMOUNT patch" 
    2  
    31STORAGE_FILE="${FILESYSTEM_MOD_DIR}/etc/hotplug/storage" 
    42if [ -e "${FILESYSTEM_MOD_DIR}/etc/hotplug/udev-mount-sd" ]; then 
     
    86fi 
    97 
     8echo1 "fixing some typos in AVM storage/mount code" 
     9# fix AVM typo, lsmod output is usb_storage 
     10modsed "s/lsmod | grep usb-storage/lsmod | grep usb_storage/g" "${STORAGE_FILE}" 
     11# fix AVM typo, remove '>' from 'mv -f $DEVMAP.$$ > $DEVMAP' 
     12# affected versions: Fritz!OS 6.0x for 7240/7270v2/7270v3 
     13modsed -r "s,^(mv -f [$]DEVMAP[.][$][$]) > ([$]DEVMAP)$,\1 \2," "${STORAGE_FILE}" 
     14 
     15echo1 "applying 'remove components'-part of FREETZMOUNT patch" 
    1016# we might have removed some of the components, prepend corresponding msgsend's with [ -e "some_maybe_removed_component" ] && msgsend 
    1117for file in "${STORAGE_FILE}" "${RUN_MOUNT_FILE}"; do 
     
    2127RUN_LIBMODMOUNT="[ -x /usr/lib/libmodmount.sh ] && . /usr/lib/libmodmount.sh$PATCHED_BY_FREETZ" 
    2228 
    23 # first of all old usbstorage stuff 
    24  
    2529# (filesystem) modules are loaded by modload 
    2630modsed 's/modprobe vfat//' "${STORAGE_FILE}" 
     
    3337done 
    3438 
    35 # fix AVM typo, lsmod output is usb_storage 
    36 modsed "s/lsmod | grep usb-storage/lsmod | grep usb_storage/g" "${STORAGE_FILE}" 
    37  
    38 # fix AVM typo, remove '>' from 'mv -f $DEVMAP.$$ > $DEVMAP' 
    39 # affected versions: Fritz!OS 6.0x for 7240/7270v2/7270v3 
    40 modsed -r "s,^(mv -f [$]DEVMAP[.][$][$]) > ([$]DEVMAP)$,\1 \2," "${STORAGE_FILE}" 
    41  
    42 # and now the new patching of /etc/hotplug/storage and /etc/hotplug/run_mount 
     39# and now patch /etc/hotplug/storage and /etc/hotplug/run_mount 
    4340 
    4441echo2 "patching run_mount script" 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.