mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-27 00:21:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1730 from flatcar/jepio/btrfs-opt

Browse Source 
Mount btrfs fs with rescue= option
This commit is contained in:
Jeremi Piotrowski 2024-03-12 15:05:08 +01:00 committed by GitHub
commit 61c3af32fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_library/disk_util
View File

@ -603,7 +603,7 @@ def Mount(options):
if options.read_only or ('verity' in mount.get('features', []) and not options.writable_verity): if options.read_only or ('verity' in mount.get('features', []) and not options.writable_verity):
mount_opts.append('ro') mount_opts.append('ro')
if mount.get('fs_type', None) == 'btrfs': if mount.get('fs_type', None) == 'btrfs':
mount_opts.append('norecovery') mount_opts.append('rescue=nologreplay')
if mount.get('fs_subvolume', None): if mount.get('fs_subvolume', None):
mount_opts.append('subvol=%s' % mount['fs_subvolume']) mount_opts.append('subvol=%s' % mount['fs_subvolume'])

0
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r22.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild vendored
View File

@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="f627c4def9ff42cc6bf4b04cf211e11a42b34f31" # flatcar-master CROS_WORKON_COMMIT="541576a4dcd56397597abef7d9ce4c539631ed65" # flatcar-master
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi