diff options
| author | Colin Walters <walters@verbum.org> | 2017-08-04 15:58:41 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-09 13:46:17 +0000 |
| commit | f1102763dfda1d1acc0352b66cf9f309d28d6b1a (patch) | |
| tree | 99c64dd745a7e6d0e96d9ca8f933fbb3cc326473 /tests/test-admin-deploy-uboot.sh | |
| parent | 8b60f63f58639dfebbc608fae853c29a11ce4177 (diff) | |
| download | ostree-f1102763dfda1d1acc0352b66cf9f309d28d6b1a.tar.gz | |
lib/sysroot-deploy: Refactor kernel layout parsing
I'd like to move the new canonical kernel directory to `/usr/lib/modules/$kver`,
as Fedora has done. The `get_kernel_from_tree()` function now abstracts over
parsing the data (src vs destination filenames, as well as checksum) in
preparation for adding the new case.
In preparation for this, let's change the current test suite to use the
*current* directory of `/usr/lib/ostree-boot`, and also add coverage of `/boot`.
Closes: #1053
Approved by: jlebon
Diffstat (limited to 'tests/test-admin-deploy-uboot.sh')
| -rwxr-xr-x | tests/test-admin-deploy-uboot.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-admin-deploy-uboot.sh b/tests/test-admin-deploy-uboot.sh index 5262b48a..3685e31e 100755 --- a/tests/test-admin-deploy-uboot.sh +++ b/tests/test-admin-deploy-uboot.sh @@ -30,8 +30,7 @@ setup_os_repository "archive-z2" "uboot" . $(dirname $0)/admin-test.sh cd ${test_tmpdir} -ln -s ../../boot/ osdata/usr/lib/ostree-boot -cat << 'EOF' > osdata/boot/uEnv.txt +cat << 'EOF' > osdata/usr/lib/ostree-boot/uEnv.txt loaduimage=load mmc ${bootpart} ${loadaddr} ${kernel_image} loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}${fdtfile} loadramdisk=load mmc ${bootpart} ${rdaddr} ${ramdisk_image} |