@@ -342,7 +342,6 @@ function prepare_partitions() {
342342
343343 if [[ $ROOTFS_TYPE == btrfs ]]; then
344344 btrfs_root_subvolume=" ${BTRFS_ROOT_SUBVOLUME:-@ } "
345- mountopts[$ROOTFS_TYPE ]=' commit=120'
346345 run_host_command_logged btrfs subvolume create $MOUNT /$btrfs_root_subvolume
347346 # getting the subvolume id of the newly created volume @ to install it
348347 # as the default volume for mounting without explicit reference
@@ -363,27 +362,27 @@ function prepare_partitions() {
363362
364363 run_host_command_logged umount $rootdevice
365364 display_alert " Remounting rootfs" " $rootdevice (UUID=${ROOT_PART_UUID} )"
366- run_host_command_logged mount -odefaults, ${mountopts[$ROOTFS_TYPE]} ${fscreateopt} $rootdevice $MOUNT /
365+ run_host_command_logged mount -odefaults${mountopts[$ROOTFS_TYPE]} ${fscreateopt} $rootdevice $MOUNT /
367366 fi
368367 rootfs=" UUID=$( blkid -s UUID -o value $rootdevice ) "
369- echo " $rootfs / ${mkfs[$ROOTFS_TYPE]} defaults, ${mountopts[$ROOTFS_TYPE]} 0 1" >> $SDCARD /etc/fstab
368+ echo " $rootfs / ${mkfs[$ROOTFS_TYPE]} defaults${mountopts[$ROOTFS_TYPE]} 0 1" >> $SDCARD /etc/fstab
370369 if [[ $ROOTFS_TYPE == btrfs ]]; then
371370 call_extension_method " btrfs_root_add_subvolumes_fstab" << - 'BTRFS_ROOT_ADD_SUBVOLUMES_FSTAB '
372371 run_host_command_logged mkdir -p $MOUNT/home
373- run_host_command_logged mount -odefaults, ${mountopts[$ROOTFS_TYPE]},subvol=@home $rootdevice $MOUNT/home
374- echo "$rootfs /home btrfs defaults, ${mountopts[$ROOTFS_TYPE]},subvol=@home 0 2" >> $SDCARD/etc/fstab
372+ run_host_command_logged mount -odefaults${mountopts[$ROOTFS_TYPE]},subvol=@home $rootdevice $MOUNT/home
373+ echo "$rootfs /home btrfs defaults${mountopts[$ROOTFS_TYPE]},subvol=@home 0 2" >> $SDCARD/etc/fstab
375374 run_host_command_logged mkdir -p $MOUNT/var
376- run_host_command_logged mount -odefaults, ${mountopts[$ROOTFS_TYPE]},subvol=@var $rootdevice $MOUNT/var
377- echo "$rootfs /var btrfs defaults, ${mountopts[$ROOTFS_TYPE]},subvol=@var 0 2" >> $SDCARD/etc/fstab
375+ run_host_command_logged mount -odefaults${mountopts[$ROOTFS_TYPE]},subvol=@var $rootdevice $MOUNT/var
376+ echo "$rootfs /var btrfs defaults${mountopts[$ROOTFS_TYPE]},subvol=@var 0 2" >> $SDCARD/etc/fstab
378377 run_host_command_logged mkdir -p $MOUNT/var/log
379- run_host_command_logged mount -odefaults, ${mountopts[$ROOTFS_TYPE]},subvol=@var_log $rootdevice $MOUNT/var/log
380- echo "$rootfs /var/log btrfs defaults, ${mountopts[$ROOTFS_TYPE]},subvol=@var_log 0 2" >> $SDCARD/etc/fstab
378+ run_host_command_logged mount -odefaults${mountopts[$ROOTFS_TYPE]},subvol=@var_log $rootdevice $MOUNT/var/log
379+ echo "$rootfs /var/log btrfs defaults${mountopts[$ROOTFS_TYPE]},subvol=@var_log 0 2" >> $SDCARD/etc/fstab
381380 run_host_command_logged mkdir -p $MOUNT/var/cache
382- run_host_command_logged mount -odefaults, ${mountopts[$ROOTFS_TYPE]},subvol=@var_cache $rootdevice $MOUNT/var/cache
383- echo "$rootfs /var/cache btrfs defaults, ${mountopts[$ROOTFS_TYPE]},subvol=@var_cache 0 2" >> $SDCARD/etc/fstab
381+ run_host_command_logged mount -odefaults${mountopts[$ROOTFS_TYPE]},subvol=@var_cache $rootdevice $MOUNT/var/cache
382+ echo "$rootfs /var/cache btrfs defaults${mountopts[$ROOTFS_TYPE]},subvol=@var_cache 0 2" >> $SDCARD/etc/fstab
384383 run_host_command_logged mkdir -p $MOUNT/srv
385- run_host_command_logged mount -odefaults, ${mountopts[$ROOTFS_TYPE]},subvol=@srv $rootdevice $MOUNT/srv
386- echo "$rootfs /srv btrfs defaults, ${mountopts[$ROOTFS_TYPE]},subvol=@srv 0 2" >> $SDCARD/etc/fstab
384+ run_host_command_logged mount -odefaults${mountopts[$ROOTFS_TYPE]},subvol=@srv $rootdevice $MOUNT/srv
385+ echo "$rootfs /srv btrfs defaults${mountopts[$ROOTFS_TYPE]},subvol=@srv 0 2" >> $SDCARD/etc/fstab
387386 BTRFS_ROOT_ADD_SUBVOLUMES_FSTAB
388387 fi
389388
0 commit comments