Project

General

Profile

« Previous | Next » 

Revision 6ee5b44a

Added by Brad Davis 7 months ago

Properly quote these variables

View differences:

src/etc/rc.ramdisk_functions.sh
83 83 
ramdisk_was_active() {
84 84 
	# If /var is on a memory disk, then RAM disks are active now or were active and recently disabled
85 85 
	DISK_NAME=`/bin/df /var/db/rrd | /usr/bin/tail -1 | /usr/bin/awk '{print $1;}'`
86 
	DISK_TYPE=`/usr/bin/basename ${DISK_NAME} | /usr/bin/cut -c1-2`
86 
	DISK_TYPE=$( /usr/bin/basename "${DISK_NAME}" | /usr/bin/cut -c1-2 )
87 87 
	[ "${DISK_TYPE}" = "md" ]
88 88 
	return $?
89 89 
}
......
97 97 
	NAME=${1}
98 98 
	DEFAULT_SIZE=$(eval echo \${RAMDISK_DEFAULT_SIZE_${NAME}})
99 99 

  		




  100
  
  
    
	SIZE=$(/usr/local/sbin/read_xml_tag.sh string system/use_mfs_${NAME}_size)


  		




  101
  
  
    
	if [ -n "${SIZE}" ] && [ ${SIZE} -gt 0 ]; then


  		




  102
  
  
    
		echo ${SIZE}


  		




  
  100
  
    
	SIZE=$(/usr/local/sbin/read_xml_tag.sh string "system/use_mfs_${NAME}_size")


  		




  
  101
  
    
	if [ -n "${SIZE}" ] && [ "${SIZE}" -gt 0 ]; then


  		




  
  102
  
    
		echo "${SIZE}"


  		




  103
  103
  
    
	else


  		




  104
  
  
    
		echo ${DEFAULT_SIZE}


  		




  
  104
  
    
		echo "${DEFAULT_SIZE}"


  		




  105
  105
  
    
	fi


  		




  106
  106
  
    
	return 0


  		




  107
  107
  
    
}


  		




  ......




  134
  134
  
    
	else


  		




  135
  135
  
    
		MODE="1755"


  		




  136
  136
  
    
	fi


  		




  137
  
  
    
	/sbin/mount -o rw,size=${SIZE},mode=${MODE} -t tmpfs tmpfs /${NAME}


  		




  
  137
  
    
	/sbin/mount -o rw,size="${SIZE}",mode="${MODE}" -t tmpfs tmpfs "/${NAME}"


  		




  138
  138
  
    
	return $?


  		




  139
  139
  
    
}


  		




  140
  140
  
    

  		




  ......




  157
  157
  
    
#   ramdisk_relocate_pkgdb disk


  		




  158
  158
  
    
#   ramdisk_relocate_pkgdb ram


  		




  159
  159
  
    
ramdisk_relocate_pkgdb () {


  		




  160
  
  
    
	if [ ${1} = "disk" ]; then


  		




  
  160
  
    
	if [ "${1}" = "disk" ]; then


  		




  161
  161
  
    
		local SRC=/root


  		




  162
  162
  
    
		local DST=


  		




  163
  163
  
    
	else


  		












Also available in:  Unified diff