Comparar texto

Encuentra la diferencia entre dos archivos de texto

Editor live
Ocultar sin cambios
Sin ajuste de línea
Vista
Nivel de detalle
Resaltado de sintaxis

balena 6.5.1 vs 6.5.24

Creado El diff nunca expira
45 eliminaciones
304 líneas
46 adiciones
308 líneas
/dev/disk5 (external, physical):
/dev/disk5 (external, physical):
#: TYPE NAME SIZE IDENTIFIER
#: TYPE NAME SIZE IDENTIFIER
0: FDisk_partition_scheme *256.1 GB disk5
0: FDisk_partition_scheme *256.1 GB disk5
1: Windows_FAT_32 resin-boot 83.9 MB disk5s1
1: Windows_FAT_32 resin-boot 83.9 MB disk5s1
2: Linux 671.1 MB disk5s2
2: Linux 671.1 MB disk5s2
3: Linux 671.1 MB disk5s3
3: Linux 671.1 MB disk5s3
4: Linux 21.0 MB disk5s5
4: Linux 21.0 MB disk5s5
5: Linux 254.6 GB disk5s6
5: Linux 205.5 MB disk5s6
(free space) 254.4 GB -


(base)
(base)
~ via 🅒 base
~ via 🅒 base
➜ sudo gpt -r show /dev/disk5
➜ sudo gpt -r show /dev/disk5
Password:
Password:
start size index contents
start size index contents
0 1 MBR
0 1 MBR
1 8191
1 8191
8192 163840 1 MBR part 12
8192 163840 1 MBR part 12
172032 1310720 2 MBR part 131
172032 1310720 2 MBR part 131
1482752 1310720 3 MBR part 131
1482752 1310720 3 MBR part 131
2793472 1 Extended MBR
2793472 1 Extended MBR
2793473 8191
2793473 8191
2801664 40960 1 Extended MBR part 131
2801664 40960 1 Extended MBR part 131
2842624 7936
2842624 8064
2850560 497267632 2 Extended MBR part 5
2850688 401536 2 Extended MBR part 5
3252224 496865968
(base)
(base)
~ via 🅒 base took 5s
~ via 🅒 base took 5s
➜ ls -la /Volumes/resin-boot
➜ ls -la /Volumes/resin-boot
total 45736
total 45756
drwx------@ 1 cm staff 0 29 Apr 18:51 .
drwx------@ 1 cm staff 0 29 Apr 17:54 .
drwxr-xr-x 5 root wheel 160 29 Apr 18:51 ..
drwxr-xr-x 5 root wheel 160 29 Apr 17:54 ..
drwx------ 1 cm staff 512 29 Apr 18:51 .fseventsd
drwx------ 1 cm staff 512 29 Apr 17:54 .fseventsd
drwx------ 1 cm staff 512 29 Apr 18:51 .Spotlight-V100
drwx------ 1 cm staff 512 29 Apr 17:54 .Spotlight-V100
-rwx------ 1 cm staff 24 15 Mar 10:53 balena-image
-rwx------ 1 cm staff 24 29 Apr 13:34 balena-image
-rwx------ 1 cm staff 22269 15 Mar 10:53 balenaos.fingerprint
-rwx------ 1 cm staff 23407 29 Apr 13:34 balenaos.fingerprint
-rwx------ 1 cm staff 76970 15 Mar 10:53 bcm2712-rpi-5-b.dtb
-rwx------ 1 cm staff 78331 29 Apr 13:34 bcm2712-rpi-5-b.dtb
-rwx------ 1 cm staff 76926 15 Mar 10:53 bcm2712-rpi-500.dtb
-rwx------ 1 cm staff 78287 29 Apr 13:34 bcm2712-rpi-500.dtb
-rwx------ 1 cm staff 77368 15 Mar 10:53 bcm2712-rpi-cm5-cm4io.dtb
-rwx------ 1 cm staff 78973 29 Apr 13:34 bcm2712-rpi-cm5-cm4io.dtb
-rwx------ 1 cm staff 77430 15 Mar 10:53 bcm2712-rpi-cm5-cm5io.dtb
-rwx------ 1 cm staff 79039 29 Apr 13:34 bcm2712-rpi-cm5-cm5io.dtb
-rwx------ 1 cm staff 77409 15 Mar 10:53 bcm2712-rpi-cm5l-cm4io.dtb
-rwx------ 1 cm staff 79014 29 Apr 13:34 bcm2712-rpi-cm5l-cm4io.dtb
-rwx------ 1 cm staff 77471 15 Mar 10:53 bcm2712-rpi-cm5l-cm5io.dtb
-rwx------ 1 cm staff 79080 29 Apr 13:34 bcm2712-rpi-cm5l-cm5io.dtb
-rwx------ 1 cm staff 76974 15 Mar 10:53 bcm2712d0-rpi-5-b.dtb
-rwx------ 1 cm staff 78335 29 Apr 13:34 bcm2712d0-rpi-5-b.dtb
-rwx------ 1 cm staff 52476 15 Mar 10:53 bootcode.bin
-rwx------ 1 cm staff 52476 29 Apr 13:34 bootcode.bin
-rwx------ 1 cm staff 1024 15 Mar 10:53 bootenv
-rwx------ 1 cm staff 1024 29 Apr 13:34 bootenv
-rwx------ 1 cm staff 189 15 Mar 10:53 cmdline.txt
-rwx------ 1 cm staff 189 29 Apr 13:34 cmdline.txt
-rwx------ 1 cm staff 667 29 Apr 17:50 config.json
-rwx------ 1 cm staff 495 29 Apr 16:44 config.json
-rwx------ 1 cm staff 2183 15 Mar 10:53 config.txt
-rwx------ 1 cm staff 2235 29 Apr 13:34 config.txt
-rwx------ 1 cm staff 2022 15 Mar 10:53 device-type.json
-rwx------ 1 cm staff 2022 29 Apr 13:34 device-type.json
-rwx------ 1 cm staff 3204 15 Mar 10:53 fixup_cd.dat
-rwx------ 1 cm staff 3204 29 Apr 13:34 fixup_cd.dat
-rwx------ 1 cm staff 10268 15 Mar 10:53 fixup_x.dat
-rwx------ 1 cm staff 10268 29 Apr 13:34 fixup_x.dat
-rwx------ 1 cm staff 7303 15 Mar 10:53 fixup.dat
-rwx------ 1 cm staff 7303 29 Apr 13:34 fixup.dat
-rwx------ 1 cm staff 41 15 Mar 10:53 image-version-info
-rwx------ 1 cm staff 41 29 Apr 13:34 image-version-info
-rwx------ 1 cm staff 15214526 15 Mar 10:53 kernel8.img
-rwx------ 1 cm staff 15214540 29 Apr 13:34 kernel8.img
-rwx------ 1 cm staff 174 15 Mar 10:53 os-release
-rwx------ 1 cm staff 178 29 Apr 13:34 os-release
drwx------ 1 cm staff 29696 15 Mar 10:53 overlays
drwx------ 1 cm staff 31232 29 Apr 13:34 overlays
-rwx------ 1 cm staff 0 15 Mar 10:53 rpi-bootfiles-20241126.stamp
-rwx------ 1 cm staff 0 29 Apr 13:34 rpi-bootfiles-20241126.stamp
drwx------ 1 cm staff 1024 15 Mar 10:53 splash
drwx------ 1 cm staff 512 29 Apr 13:34 splash
-rwx------ 1 cm staff 808892 15 Mar 10:53 start_cd.elf
-rwx------ 1 cm staff 808892 29 Apr 13:34 start_cd.elf
-rwx------ 1 cm staff 3727656 15 Mar 10:53 start_x.elf
-rwx------ 1 cm staff 3727656 29 Apr 13:34 start_x.elf
-rwx------ 1 cm staff 2980544 15 Mar 10:53 start.elf
-rwx------ 1 cm staff 2980544 29 Apr 13:34 start.elf
drwx------ 1 cm staff 512 15 Mar 10:53 system-connections
drwx------ 1 cm staff 512 29 Apr 13:34 system-connections
drwx------ 1 cm staff 512 15 Mar 10:53 system-proxy
drwx------ 1 cm staff 512 29 Apr 13:34 system-proxy
(base)
(base)
~ via 🅒 base
~ via 🅒 base
➜ cat /Volumes/resin-boot/cmdline.txt
➜ cat /Volumes/resin-boot/cmdline.txt
dwc_otg.lpm_enable=0 rootfstype=ext4 rootwait dwc_otg.lpm_enable=0 rootwait console=null quiet splash vt.global_cursor_default=0 consoleblank=0 cgroup_enable=memory balena_stage2 maxcpus=0
dwc_otg.lpm_enable=0 rootfstype=ext4 rootwait dwc_otg.lpm_enable=0 rootwait console=null quiet splash vt.global_cursor_default=0 consoleblank=0 cgroup_enable=memory balena_stage2 maxcpus=0
(base)
(base)
~ via 🅒 base
~ via 🅒 base
➜ cat /Volumes/resin-boot/config.txt
➜ cat /Volumes/resin-boot/config.txt




#sdtv_mode=0
#sdtv_mode=0


#sdtv_aspect=1
#sdtv_aspect=1


#sdtv_disable_colourburst=1
#sdtv_disable_colourburst=1




#hdmi_safe=1
#hdmi_safe=1


#hdmi_force_hotplug=1
#hdmi_force_hotplug=1


#hdmi_ignore_hotplug=1
#hdmi_ignore_hotplug=1


#hdmi_drive=2
#hdmi_drive=2


#hdmi_ignore_edid=0xa5000080
#hdmi_ignore_edid=0xa5000080


#hdmi_edid_file=1
#hdmi_edid_file=1


#hdmi_ignore_edid_audio=1
#hdmi_ignore_edid_audio=1


#hdmi_force_edid_audio=1
#hdmi_force_edid_audio=1


#hdmi_force_edid_3d=1
#hdmi_force_edid_3d=1


#avoid_edid_fuzzy_match=1
#avoid_edid_fuzzy_match=1


#hdmi_pixel_encoding=1
#hdmi_pixel_encoding=1


#hdmi_group=1
#hdmi_group=1


#hdmi_mode=1
#hdmi_mode=1


#config_hdmi_boost=0
#config_hdmi_boost=0


#hdmi_ignore_cec_init=1
#hdmi_ignore_cec_init=1


#hdmi_ignore_cec=1
#hdmi_ignore_cec=1




#overscan_left=0
#overscan_left=0


#overscan_right=0
#overscan_right=0


#overscan_top=0
#overscan_top=0


#overscan_bottom=0
#overscan_bottom=0


#disable_overscan=1
#disable_overscan=1




#framebuffer_width=0
#framebuffer_width=0


#framebuffer_height=0
#framebuffer_height=0


#framebuffer_depth=16
#framebuffer_depth=16


#framebuffer_ignore_alpha=0
#framebuffer_ignore_alpha=0




#display_rotate=0
#display_rotate=0


#dispmanx_offline=0
#dispmanx_offline=0




#decode_MPG2=0x12345678
#decode_MPG2=0x12345678


#decode_WVC1=0x12345678
#decode_WVC1=0x12345678




#start_x=0
#start_x=0


#disable_camera_led=1
#disable_camera_led=1




#test_mode=0
#test_mode=0




#disable_l2cache=0
#disable_l2cache=0


gpu_mem=16
gpu_mem=16


#gpu_mem_256=192
#gpu_mem_256=192


#gpu_mem_512=448
#gpu_mem_512=448


#gpu_mem_1024=944
#gpu_mem_1024=944


#disable_pvt=1
#disable_pvt=1




#cma_lwm=16
#cma_lwm=16


#cma_hwm=32
#cma_hwm=32




#disable_commandline_tags=0
#disable_commandline_tags=0


#cmdline=""
#cmdline=""


#kernel=""
#kernel=""


#kernel_address=0x00000000
#kernel_address=0x00000000


#kernel_old=1
#kernel_old=1


#ramfsfile=""
#ramfsfile=""


#ramfsaddr=0x00000000
#ramfsaddr=0x00000000


#initramfs initramf.gz 0x00800000
#initramfs initramf.gz 0x00800000


#device_tree_address=0x00000000
#device_tree_address=0x00000000


#init_uart_baud=115200
#init_uart_baud=115200


#init_uart_clock=3000000
#init_uart_clock=3000000


#init_emmc_clock=100000000
#init_emmc_clock=100000000


#boot_delay=0
#boot_delay=0


#boot_delay_ms=0
#boot_delay_ms=0


#avoid_safe_mode=1
#avoid_safe_mode=1


#disable_splash=1
#disable_splash=1




#force_turbo=0
#force_turbo=0


#initial_turbo=0
#initial_turbo=0


#temp_limit=85
#temp_limit=85


#arm_freq=700
#arm_freq=700


#arm_freq_min=700
#arm_freq_min=700


#gpu_freq=250
#gpu_freq=250


#core_freq=250
#core_freq=250


#core_freq_min=250
#core_freq_min=250


#h264_freq=250
#h264_freq=250


#isp_freq=250
#isp_freq=250


#v3d_freq=250
#v3d_freq=250


#sdram_freq=400
#sdram_freq=400


#sdram_freq_min=400
#sdram_freq_min=400


#avoid_pwm_pll=1
#avoid_pwm_pll=1




#current_limit_override=0x5A000020
#current_limit_override=0x5A000020


#over_voltage=0
#over_voltage=0


#over_voltage_min=0
#over_voltage_min=0


#over_voltage_sdram=0
#over_voltage_sdram=0


#over_voltage_sdram_c=0
#over_voltage_sdram_c=0


#over_voltage_sdram_i=0
#over_voltage_sdram_i=0


#over_voltage_sdram_p=0
#over_voltage_sdram_p=0




#max_usb_current=0
#max_usb_current=0




#dtparam=audio=off
#dtparam=audio=off


#dtparam=i2c_arm=off
#dtparam=i2c_arm=off


#dtparam=i2c_vc=off
#dtparam=i2c_vc=off


#dtparam=i2c_arm_baudrate=100000
#dtparam=i2c_arm_baudrate=100000


#dtparam=i2c_vc_baudrate=100000
#dtparam=i2c_vc_baudrate=100000


#dtparam=i2s=off
#dtparam=i2s=off


#dtparam=spi=off
#dtparam=spi=off


#dtparam=random=off
#dtparam=random=off


#dtparam=uart0=on
#dtparam=uart0=on


#dtparam=watchdog=off
#dtparam=watchdog=off


#dtparam=act_led_trigger=mmc
#dtparam=act_led_trigger=mmc


#dtparam=act_led_activelow=off
#dtparam=act_led_activelow=off


#dtparam=act_led_gpio=47
#dtparam=act_led_gpio=47


#dtparam=pwr_led_trigger=mmc
#dtparam=pwr_led_trigger=mmc


#dtparam=pwr_led_activelow=off
#dtparam=pwr_led_activelow=off


#dtparam=pwr_led_gpio=35
#dtparam=pwr_led_gpio=35
# Enable UART
# Enable UART
enable_uart=0
enable_uart=0
# Enable VC4 Graphics
dtoverlay=vc4-kms-v3d,cma-320


dtparam=i2c_arm=on
dtparam=i2c_arm=on
dtparam=spi=on
dtparam=spi=on
disable_splash=1
disable_splash=1
avoid_warnings=1
avoid_warnings=1
dtparam=audio=on
dtparam=audio=on
(base)
(base)
~ via 🅒 base
~ via 🅒 base
➜ grep -i "nvme\|pci" /Volumes/resin-boot/config.txt
➜ grep -i "nvme\|pci" /Volumes/resin-boot/config.txt
(base)
(base)
~ via 🅒 base
~ via 🅒 base
➜ sudo fdisk -e /dev/disk5
➜ sudo fdisk -e /dev/disk5
fdisk: could not open MBR file /usr/standalone/i386/boot0: No such file or directory
fdisk: could not open MBR file /usr/standalone/i386/boot0: No such file or directory
Enter 'help' for information
Enter 'help' for information
fdisk: 1> print
fdisk: 1> print
Disk: /dev/disk5 geometry: 31130/255/63 [500118192 sectors]
Disk: /dev/disk5 geometry: 31130/255/63 [500118192 sectors]
Offset: 0 Signature: 0xAA55
Offset: 0 Signature: 0xAA55
Starting Ending
Starting Ending
#: id cyl hd sec - cyl hd sec [ start - size]
#: id cyl hd sec - cyl hd sec [ start - size]
------------------------------------------------------------------------
------------------------------------------------------------------------
*1: 0C 64 0 1 - 1023 3 32 [ 8192 - 163840] Win95 FAT32L
*1: 0C 64 0 1 - 1023 3 32 [ 8192 - 163840] Win95 FAT32L
2: 83 1023 3 32 - 1023 3 32 [ 172032 - 1310720] Linux files*
2: 83 1023 3 32 - 1023 3 32 [ 172032 - 1310720] Linux files*
3: 83 1023 3 32 - 1023 3 32 [ 1482752 - 1310720] Linux files*
3: 83 1023 3 32 - 1023 3 32 [ 1482752 - 1310720] Linux files*
4: 0F 1023 3 32 - 1023 7 32 [ 2793472 - 497324720] Extended LBA
4: 0F 1023 3 32 - 1023 3 32 [ 2793472 - 458752] Extended LBA
fdisk: 1>
fdisk: 1>
Diferencias guardadas