mirror of
				https://github.com/Ysurac/openmptcprouter-feeds.git
				synced 2025-03-09 15:40:03 +00:00 
			
		
		
		
	Merge branch 'develop' into master
This commit is contained in:
		
						commit
						12faf58496
					
				
					 1 changed files with 13 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -1,20 +1,24 @@
 | 
			
		|||
--- a/rpi-eeprom-update	2020-08-23 10:36:21.892002253 +0200
 | 
			
		||||
+++ b/rpi-eeprom-update	2020-08-23 10:36:41.819672745 +0200
 | 
			
		||||
@@ -166,7 +166,7 @@
 | 
			
		||||
--- a/rpi-eeprom-update	2020-11-05 21:58:02.247836497 +0100
 | 
			
		||||
+++ b/rpi-eeprom-update	2020-11-05 21:58:36.911266307 +0100
 | 
			
		||||
@@ -186,8 +186,8 @@
 | 
			
		||||
                 || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}"
 | 
			
		||||
 
 | 
			
		||||
         # For NFS mounts ensure that the files are readable to the TFTP user
 | 
			
		||||
-        chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig"
 | 
			
		||||
+        #chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig"
 | 
			
		||||
-        chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \
 | 
			
		||||
-                || die "Failed to set permissions on eeprom update files"
 | 
			
		||||
+        #chmod -f go+r "${BOOTFS}/pieeprom.upd" "${BOOTFS}/pieeprom.sig" \
 | 
			
		||||
+        #        || die "Failed to set permissions on eeprom update files"
 | 
			
		||||
    fi
 | 
			
		||||
 
 | 
			
		||||
    if [ -n "${VL805_UPDATE_IMAGE}" ]; then
 | 
			
		||||
@@ -175,7 +175,7 @@
 | 
			
		||||
         cp -f "${VL805_UPDATE_IMAGE}" "${BOOTFS}/vl805.bin"
 | 
			
		||||
@@ -198,8 +198,8 @@
 | 
			
		||||
                 || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin"
 | 
			
		||||
 
 | 
			
		||||
         # For NFS mounts ensure that the files are readable to the TFTP user
 | 
			
		||||
-        chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig"
 | 
			
		||||
+        #chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig"
 | 
			
		||||
-        chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
 | 
			
		||||
-                || die "Failed to set permissions on eeprom update files"
 | 
			
		||||
+        #chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
 | 
			
		||||
+        #        || die "Failed to set permissions on eeprom update files"
 | 
			
		||||
    fi
 | 
			
		||||
 
 | 
			
		||||
    cp -f "${RECOVERY_BIN}" "${BOOTFS}/recovery.bin" \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue