Changeset 13023


Ignorieren:
Zeitstempel:
20.03.2015 17:06:11 (vor 3 Jahren)
Autor:
er13
Nachricht:

FreetzMount:

  • in 6.25 AVM has once again changed the format of DEVMAP, instead of /proc/bus/usb/001/002=/dev/sda1:mount-point-name it is now 001/002=/dev/sda1:mount-point-name - so instead of /proc/bus/usb/001/002 just 001/002 is now passed all over the code - do adjust our replacement of do_mount_locked accordingly
  • refs #2572, fixes #2712
Datei:
1 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/mod/files/root/usr/lib/libmodmount.sh

    r13019 r13023  
    103103# separated from do_mount since fw 04.89 
    104104# 
    105 # $1 - proc device (e.g. /proc/bus/usb/001/002) 
     105# $1 - proc device, e.g. /proc/bus/usb/001/002 (before 6.25) or just 001/002 (since 6.25) 
    106106# $2 - block device name (including /dev/ prefix, e.g. /dev/sda1) 
    107107# $3 - partition number 
     
    138138    # TODO: it should be enough to do it on successful mount only, i.e. if err_fs_mount==0 
    139139    if grep -q $mnt_path /proc/mounts; then 
    140         if [ -f "$1" ]; then 
     140        if [ -f "$1" -o -f "/proc/bus/usb/$1" -o -f "/dev/bus/usb/$1" ]; then 
    141141            grep -v "^$1=$2:" $DEVMAP > /var/dev-$$.map 
    142142            echo "$1=$2:$mnt_name" >> /var/dev-$$.map 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.