diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2016-08-23 14:32:35 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-08-27 13:11:22 +0000 |
| commit | b6ec7526b58fa6d42792c460f3eedff410cb2c60 (patch) | |
| tree | d0c20db49fed38432d95f6f3fb3825b1dfa3c6c8 /tests/admin-test.sh | |
| parent | 47b0b4120a9bb3d68318b7e479b1314183857868 (diff) | |
| download | ostree-b6ec7526b58fa6d42792c460f3eedff410cb2c60.tar.gz | |
u-boot: Merge ostree's and systems uEnv.txt
This is a proper fix for:
https://bugzilla.gnome.org/show_bug.cgi?id=755787
With this patch, an admin (system builder) can now:
1) Edit /usr/lib/ostree-boot/uEnv.txt
2) Deploy the new tree. OSTree will append system's uEnv.txt
to the OSTree's managed uEnv.txt (loader/uEnv.txt).
It is common for u-boot systems to read in an extra env
from external /uEnv.txt. The same file OSTree uses to pass
in its env. With this patch /uEnv.txt now contains OSTree's
env + custom env added by system builders.
Closes: #466
Approved by: cgwalters
Diffstat (limited to 'tests/admin-test.sh')
| -rwxr-xr-x | tests/admin-test.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/admin-test.sh b/tests/admin-test.sh index dcc34068..76fc8b85 100755 --- a/tests/admin-test.sh +++ b/tests/admin-test.sh @@ -18,8 +18,6 @@ set -euo pipefail -echo "1..16" - function validate_bootloader() { cd ${test_tmpdir}; bootloader="" |