mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-01-20 16:01:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

2345.99.0

Browse Source
This commit is contained in:
Flatcar Buildbot 2019-12-09 18:23:56 +01:00 committed by Dongsu Park
parent 8ac3182bc3
commit fcc94ad9cf
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_library/disk_layout.json
View File

@ -26,7 +26,7 @@
"3":{
"label":"USR-A",
"uuid":"7130c94a-213a-4e5a-8e26-6cce9662f132",
"type":"flatcar-rootfs",
"type":"coreos-rootfs",
"blocks":"2097152",
"fs_blocks":"260094",
"fs_type":"ext2",
@ -36,7 +36,7 @@
"4":{
"label":"USR-B",
"uuid":"e03dd35c-7c2d-4a47-b3fe-27f15780a57c",
"type":"flatcar-rootfs",
"type":"coreos-rootfs",
"blocks":"2097152",
"fs_blocks":"262144"
},
@ -56,18 +56,18 @@
},
"7":{
"label":"OEM-CONFIG",
"type":"flatcar-reserved",
"type":"coreos-reserved",
"blocks":"131072"
},
"8":{
"type":"blank",
"label":"flatcar-reserved",
"label":"coreos-reserved",
"blocks":"0"
},
"9":{
"label":"ROOT",
"fs_label":"ROOT",
"type":"flatcar-resize",
"type":"coreos-resize",
"blocks":"4427776",
"fs_type":"ext4",
"mount":"/"

2
build_library/disk_util
View File

@ -400,7 +400,7 @@ def FormatExt(part, device):
if 'fs_label' in part:
tune_cmd += ['-L', part['fs_label']]
if part['type'] == 'flatcar-usr':
if part['type'] == 'coreos-usr':
tune_cmd += ['-U', 'clear',
'-T', '20091119110000',
'-c', '0', '-i', '0', # Disable auto fsck

2
build_library/grub.cfg
View File

@ -19,7 +19,7 @@ set randomize_disk_guid=""
set oem_id=""
# Anything else the OEM adds should use this variable.
set linux_append=""
set linux_append="systemd.unified_cgroup_hierarchy=false systemd.legacy_systemd_cgroup_controller=false"
set secure_boot="0"

4
build_library/test_image_content.sh
View File

@ -5,9 +5,9 @@
GLSA_WHITELIST=(
201412-09 # incompatible CA certificate version numbers
201908-14 # backported both CVE fixes
201909-01 # perl
201909-08 # dbus
201904-13 # git
201909-01 # Perl, SDK only
201909-08 # backported fix
)
glsa_image() {

2
build_torcx_store
View File

@ -237,14 +237,12 @@ function torcx_package() {
# for each package will point at the last version specified. This can handle
# swapping default package versions for different OS releases by reordering.
DEFAULT_IMAGES=(
=app-torcx/docker-1.12
=app-torcx/docker-19.03
)
# This list contains extra images which will be uploaded and included in the
# generated manifest, but won't be included in the vendor store.
EXTRA_IMAGES=(
=app-torcx/docker-17.03
)
mkdir -p "${BUILD_DIR}"