mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-24 12:01:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152 from marineam/remount

Browse Source 
Some -usr updates
This commit is contained in:
Michael Marineau 2014-01-20 11:17:11 -08:00
commit b5ebd7e32e
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_library/base_image_util.sh
View File

@ -60,8 +60,10 @@ create_base_image() {
# Zero all fs free space to make it more compressible so auto-update
# payloads become smaller, not fatal since it won't work on linux < 3.2
sudo fstrim "${root_fs_dir}" || true
if [[ -d "${root_fs_dir}/media/state" ]]; then
sudo fstrim "${root_fs_dir}/media/state" || true
if [[ "${disk_layout}" == *-usr ]]; then
sudo fstrim "${root_fs_dir}/usr" || true
else
sudo fstrim "${root_fs_dir}/media/state" || true
fi
cleanup_mounts "${root_fs_dir}"

16
build_library/dev_image_util.sh
View File

@ -36,10 +36,22 @@ install_dev_packages() {
sudo mkdir -p "${root_fs_dir}/root"
sudo touch "${root_fs_dir}/root/.dev_mode"
# Remount the system partition read-write by default.
# The remount services are provided by coreos-base/coreos-init
local fs_wants="${root_fs_dir}/usr/lib/systemd/system/local-fs.target.wants"
sudo mkdir -p "${fs_wants}"
if [[ "${disk_layout}" == *-usr ]]; then
sudo ln -s ../remount-usr.service "${fs_wants}"
else
sudo ln -s ../remount-root.service "${fs_wants}"
fi
# Zero all fs free space, not fatal since it won't work on linux < 3.2
sudo fstrim "${root_fs_dir}" || true
if [[ -d "${root_fs_dir}/media/state" ]]; then
sudo fstrim "${root_fs_dir}/media/state" || true
if [[ "${disk_layout}" == *-usr ]]; then
sudo fstrim "${root_fs_dir}/usr" || true
else
sudo fstrim "${root_fs_dir}/media/state" || true
fi
info "Developer image built and stored at ${image_name}"