Skip to content

Commit 9f48e21

Browse files
martinezjavierrh-atomic-bot
martinezjavier
authored and
rh-atomic-bot
committed
deploy: Change BootLoaderSpec filenames so they can be used for sorting
Currently the BLS snippets are named ostree-$ID-$VARIANT_ID-$index.conf, but the BLS config files are actually sorted by using the version field which is the inverse of the index. In most places, _ostree_sysroot_read_boot_loader_configs() is used to get the BLS files and this function already returns them sorted by the version field. The only place where the index trailing number is used is in the ostree-grub-generator script that lists the BLS files to populate the grub config file. But for some bootloaders the BLS filename is the criteria for sorting by taking the filename as a string version. So on these bootloaders the BLS entries will be listed in the reverse order. To avoid that, change the BLS snippets filename to have the version field instead of the index and also to have the version before deployment name. Make the filenames to be of the form ostree-$version-$ID-$VARIANT_ID.conf so the version is before the deployment name. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Closes: #1654 Approved by: cgwalters
1 parent 47ae4f5 commit 9f48e21

10 files changed

+63
-62
lines changed

‎src/boot/grub2/ostree-grub-generator‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ populate_menu()
6666
else
6767
boot_prefix="${OSTREE_BOOT_PARTITION}"
6868
fi
69-
for config in $(ls -v $entries_path/*.conf); do
69+
for config in $(ls -v -r $entries_path/*.conf); do
7070
read_config ${config}
7171
menu="${menu}menuentry '${title}' {\n"
7272
menu="${menu}\t linux ${boot_prefix}${linux} ${options}\n"

‎src/libostree/ostree-sysroot-deploy.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,8 +1628,9 @@ install_deployment_kernel (OstreeSysroot *sysroot,
16281628
g_assert_cmpstr (kernel_layout->bootcsum, ==, bootcsum);
16291629
g_autofree char *bootcsumdir = g_strdup_printf ("ostree/%s-%s", osname, bootcsum);
16301630
g_autofree char *bootconfdir = g_strdup_printf ("loader.%d/entries", new_bootversion);
1631-
g_autofree char *bootconf_name = g_strdup_printf ("ostree-%s-%d.conf", osname,
1632-
ostree_deployment_get_index (deployment));
1631+
g_autofree char *bootconf_name = g_strdup_printf ("ostree-%d-%s.conf",
1632+
n_deployments - ostree_deployment_get_index (deployment),
1633+
osname);
16331634
if (!glnx_shutil_mkdir_p_at (boot_dfd, bootcsumdir, 0775, cancellable, error))
16341635
return FALSE;
16351636

‎tests/admin-test.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ echo "ok --print-current-dir"
6868
assert_not_has_dir sysroot/boot/loader.0
6969
assert_has_dir sysroot/boot/loader.1
7070
assert_has_dir sysroot/ostree/boot.1.1
71-
assert_has_file sysroot/boot/loader/entries/ostree-testos-0.conf
72-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.* root=LABEL=MOO'
73-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.* quiet'
71+
assert_has_file sysroot/boot/loader/entries/ostree-1-testos.conf
72+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* root=LABEL=MOO'
73+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* quiet'
7474
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/vmlinuz-3.6.0 'a kernel'
7575
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.0/etc/os-release 'NAME=TestOS'
7676
assert_file_has_content sysroot/ostree/boot.1/testos/${bootcsum}/0/etc/os-release 'NAME=TestOS'
@@ -96,7 +96,7 @@ assert_not_has_dir sysroot/ostree/boot.0.0
9696
assert_not_has_dir sysroot/ostree/boot.1.0
9797
assert_not_has_dir sysroot/ostree/boot.1.1
9898
# Ensure we propagated kernel arguments from previous deployment
99-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.* root=LABEL=MOO'
99+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.* root=LABEL=MOO'
100100
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.1/etc/os-release 'NAME=TestOS'
101101
assert_file_has_content sysroot/ostree/boot.0/testos/${bootcsum}/0/etc/os-release 'NAME=TestOS'
102102
assert_ostree_deployment_refs 0/1/{0,1}
@@ -123,8 +123,8 @@ ${CMD_PREFIX} ostree admin os-init otheros
123123
${CMD_PREFIX} ostree admin deploy --os=otheros testos/buildmaster/x86_64-runtime
124124
assert_not_has_dir sysroot/boot/loader.0
125125
assert_has_dir sysroot/boot/loader.1
126-
assert_has_file sysroot/boot/loader/entries/ostree-testos-1.conf
127-
assert_has_file sysroot/boot/loader/entries/ostree-otheros-0.conf
126+
assert_has_file sysroot/boot/loader/entries/ostree-2-testos.conf
127+
assert_has_file sysroot/boot/loader/entries/ostree-3-otheros.conf
128128
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.1/etc/os-release 'NAME=TestOS'
129129
assert_file_has_content sysroot/ostree/deploy/otheros/deploy/${rev}.0/etc/os-release 'NAME=TestOS'
130130
assert_ostree_deployment_refs 1/1/{0,1,2}
@@ -136,9 +136,9 @@ echo "ok independent deploy"
136136
${CMD_PREFIX} ostree admin deploy --retain --os=testos testos:testos/buildmaster/x86_64-runtime
137137
assert_has_dir sysroot/boot/loader.0
138138
assert_not_has_dir sysroot/boot/loader.1
139-
assert_has_file sysroot/boot/loader/entries/ostree-testos-0.conf
139+
assert_has_file sysroot/boot/loader/entries/ostree-4-testos.conf
140140
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.2/etc/os-release 'NAME=TestOS'
141-
assert_has_file sysroot/boot/loader/entries/ostree-testos-2.conf
141+
assert_has_file sysroot/boot/loader/entries/ostree-2-testos.conf
142142
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.3/etc/os-release 'NAME=TestOS'
143143
${CMD_PREFIX} ostree admin status
144144
assert_ostree_deployment_refs 0/1/{0,1,2,3}
@@ -172,14 +172,14 @@ echo "ok deploy with modified /etc"
172172
for i in $(seq 4); do
173173
${CMD_PREFIX} ostree admin undeploy 0
174174
done
175-
assert_has_file sysroot/boot/loader/entries/ostree-testos-0.conf
176-
assert_not_has_file sysroot/boot/loader/entries/ostree-testos-1.conf
177-
assert_not_has_file sysroot/boot/loader/entries/ostree-otheros-1.conf
175+
assert_has_file sysroot/boot/loader/entries/ostree-1-testos.conf
176+
assert_not_has_file sysroot/boot/loader/entries/ostree-2-testos.conf
177+
assert_not_has_file sysroot/boot/loader/entries/ostree-3-otheros.conf
178178
${CMD_PREFIX} ostree admin deploy --not-as-default --os=otheros testos:testos/buildmaster/x86_64-runtime
179179
assert_has_dir sysroot/boot/loader.0
180180
assert_not_has_dir sysroot/boot/loader.1
181-
assert_has_file sysroot/boot/loader/entries/ostree-testos-0.conf
182-
assert_has_file sysroot/boot/loader/entries/ostree-otheros-1.conf
181+
assert_has_file sysroot/boot/loader/entries/ostree-2-testos.conf
182+
assert_has_file sysroot/boot/loader/entries/ostree-1-otheros.conf
183183
${CMD_PREFIX} ostree admin status
184184
validate_bootloader
185185

@@ -188,9 +188,9 @@ echo "ok deploy --not-as-default"
188188
${CMD_PREFIX} ostree admin deploy --retain-rollback --os=otheros testos:testos/buildmaster/x86_64-runtime
189189
assert_not_has_dir sysroot/boot/loader.0
190190
assert_has_dir sysroot/boot/loader.1
191-
assert_has_file sysroot/boot/loader/entries/ostree-otheros-0.conf
192-
assert_has_file sysroot/boot/loader/entries/ostree-testos-1.conf
193-
assert_has_file sysroot/boot/loader/entries/ostree-otheros-2.conf
191+
assert_has_file sysroot/boot/loader/entries/ostree-3-otheros.conf
192+
assert_has_file sysroot/boot/loader/entries/ostree-2-testos.conf
193+
assert_has_file sysroot/boot/loader/entries/ostree-1-otheros.conf
194194
${CMD_PREFIX} ostree admin status
195195
validate_bootloader
196196

@@ -265,7 +265,7 @@ echo "ok deploy with unknown OS"
265265

266266
${CMD_PREFIX} ostree admin deploy --os=testos --karg-append=console=/dev/foo --karg-append=console=/dev/bar testos:testos/buildmaster/x86_64-runtime
267267
${CMD_PREFIX} ostree admin deploy --os=testos testos:testos/buildmaster/x86_64-runtime
268-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'console=/dev/foo.*console=/dev/bar'
268+
assert_file_has_content sysroot/boot/loader/entries/ostree-4-testos.conf 'console=/dev/foo.*console=/dev/bar'
269269
validate_bootloader
270270

271271
echo "ok deploy with multiple kernel args"
@@ -275,7 +275,7 @@ os_repository_new_commit 0 "test upgrade multiple kernel args"
275275
${CMD_PREFIX} ostree admin upgrade --os=testos
276276
newrev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime)
277277
assert_not_streq ${origrev} ${newrev}
278-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'console=/dev/foo.*console=/dev/bar'
278+
assert_file_has_content sysroot/boot/loader/entries/ostree-4-testos.conf 'console=/dev/foo.*console=/dev/bar'
279279
validate_bootloader
280280

281281
echo "ok upgrade with multiple kernel args"

‎tests/test-admin-deploy-2.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ oldversion=${version}
7171
# another commit with *same* bootcsum but *new* content
7272
os_repository_new_commit "1" "2"
7373
newversion=${version}
74-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf ${oldversion}
74+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf ${oldversion}
7575
${CMD_PREFIX} ostree admin upgrade --os=testos
76-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf ${newversion}
76+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf ${newversion}
7777

7878
echo "ok new version same bootcsum"
7979

‎tests/test-admin-deploy-karg.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ export rev
3535
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
3636
${CMD_PREFIX} ostree admin deploy --karg=FOO=BAR --os=testos testos:testos/buildmaster/x86_64-runtime
3737
${CMD_PREFIX} ostree admin deploy --karg=TESTARG=TESTVALUE --os=testos testos:testos/buildmaster/x86_64-runtime
38-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-1.conf 'options.*FOO=BAR'
39-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAR'
40-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
38+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=BAR'
39+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*FOO=BAR'
40+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*TESTARG=TESTVALUE'
4141
${CMD_PREFIX} ostree admin deploy --karg=ANOTHERARG=ANOTHERVALUE --os=testos testos:testos/buildmaster/x86_64-runtime
42-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
43-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*ANOTHERARG=ANOTHERVALUE'
42+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*TESTARG=TESTVALUE'
43+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*ANOTHERARG=ANOTHERVALUE'
4444

4545
echo "ok deploy with --karg, but same config"
4646

@@ -51,7 +51,7 @@ for arg in $(cat /proc/cmdline); do
5151
;;
5252
initrd=*|BOOT_IMAGE=*) # Skip options set by bootloader that gets filtered out
5353
;;
54-
*) assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg"
54+
*) assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf "options.*$arg"
5555
;;
5656
esac
5757
done
@@ -62,8 +62,8 @@ ${CMD_PREFIX} ostree admin status
6262
${CMD_PREFIX} ostree admin undeploy 0
6363

6464
${CMD_PREFIX} ostree admin deploy --os=testos --karg-append=APPENDARG=VALAPPEND --karg-append=APPENDARG=2NDAPPEND testos:testos/buildmaster/x86_64-runtime
65-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAR'
66-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
67-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND'
65+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*FOO=BAR'
66+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*TESTARG=TESTVALUE'
67+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND'
6868

6969
echo "ok deploy --karg-append"

‎tests/test-admin-deploy-syslinux.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ for test_bootdir in "boot" "usr/lib/ostree-boot"; do
3838
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime
3939
rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime)
4040
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
41-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.* root=LABEL=MOO'
42-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.* quiet'
41+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* root=LABEL=MOO'
42+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* quiet'
4343
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/vmlinuz-3.6.0 'a kernel'
4444
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/initramfs-3.6.0.img 'an initramfs'
4545
# kernel/initrams should also be in the tree's /boot with the checksum
@@ -64,7 +64,7 @@ cd ${test_tmpdir}
6464
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime
6565
rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime)
6666
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
67-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.* root=LABEL=MOO'
67+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.* root=LABEL=MOO'
6868
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/vmlinuz-3.6.0 'a kernel'
6969
assert_file_has_content sysroot/boot/ostree/testos-${bootcsum}/initramfs-3.6.0.img 'an initramfs'
7070
# Note this bootcsum shouldn't be the modules one

‎tests/test-admin-instutil-set-kargs.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,25 @@ ${CMD_PREFIX} ostree admin deploy --os=testos testos:testos/buildmaster/x86_64-r
3434

3535
${CMD_PREFIX} ostree admin instutil set-kargs FOO=BAR
3636
${CMD_PREFIX} ostree admin instutil set-kargs FOO=BAZ FOO=BIF TESTARG=TESTVALUE
37-
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAR'
38-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAZ .*FOO=BIF'
39-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
37+
assert_not_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=BAR'
38+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=BAZ .*FOO=BIF'
39+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*TESTARG=TESTVALUE'
4040
echo "ok instutil set-kargs (basic)"
4141

4242
${CMD_PREFIX} ostree admin instutil set-kargs --merge FOO=BAR
43-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAZ .*FOO=BIF .*FOO=BAR'
44-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
43+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=BAZ .*FOO=BIF .*FOO=BAR'
44+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*TESTARG=TESTVALUE'
4545
echo "ok instutil set-kargs --merge"
4646

4747
${CMD_PREFIX} ostree admin instutil set-kargs --merge --replace=FOO=XXX
48-
assert_not_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=BAR'
49-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=XXX'
50-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*TESTARG=TESTVALUE'
48+
assert_not_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=BAR'
49+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=XXX'
50+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*TESTARG=TESTVALUE'
5151
echo "ok instutil set-kargs --replace"
5252

5353
${CMD_PREFIX} ostree admin instutil set-kargs --merge --append=FOO=BAR --append=APPENDARG=VALAPPEND --append=APPENDARG=2NDAPPEND testos:testos/buildmaster/x86_64-runtime
54-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*FOO=XXX.*FOO=BAR'
55-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND'
54+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*FOO=XXX.*FOO=BAR'
55+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'options.*APPENDARG=VALAPPEND .*APPENDARG=2NDAPPEND'
5656
echo "ok instutil set-kargs --append"
5757

5858
${CMD_PREFIX} ostree admin instutil set-kargs --import-proc-cmdline
@@ -62,7 +62,7 @@ for arg in $(cat /proc/cmdline); do
6262
;;
6363
initrd=*|BOOT_IMAGE=*) # Skip options set by bootloader that gets filtered out
6464
;;
65-
*) assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg"
65+
*) assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf "options.*$arg"
6666
;;
6767
esac
6868
done

‎tests/test-admin-pull-deploy-split.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ ${CMD_PREFIX} ostree admin upgrade --os=testos --pull-only --os=testos > out.txt
4646
assert_not_file_has_content out.txt 'No update available'
4747
assert_has_dir sysroot/ostree/deploy/testos/deploy/${parent_rev}.0
4848
assert_not_has_dir sysroot/ostree/deploy/testos/deploy/${rev}.0
49-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'TestOS 42 1.0.9'
49+
assert_file_has_content sysroot/boot/loader/entries/ostree-1-testos.conf 'TestOS 42 1.0.9'
5050
assert_streq "${rev}" $(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime)
5151
# Now, generate new content upstream; we shouldn't pull it
5252
os_repository_new_commit
5353
${CMD_PREFIX} ostree admin upgrade --os=testos --deploy-only --os=testos > out.txt
5454
assert_not_file_has_content out.txt 'No update available'
55-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'TestOS 42 1.0.10'
55+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf 'TestOS 42 1.0.10'
5656
assert_has_dir sysroot/ostree/deploy/testos/deploy/${parent_rev}.0
5757
assert_has_dir sysroot/ostree/deploy/testos/deploy/${rev}.0
5858
${CMD_PREFIX} ostree admin upgrade --os=testos --deploy-only --os=testos > out.txt

‎tests/test-admin-upgrade-endoflife.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ${CMD_PREFIX} ostree admin upgrade --os=testos --pull-only
6565
${CMD_PREFIX} ostree admin upgrade --os=testos --deploy-only
6666

6767
# Check we got redirected to the new branch
68-
assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "${bootcsum}"
68+
assert_file_has_content sysroot/boot/loader/entries/ostree-2-testos.conf "${bootcsum}"
6969
rev=$(${CMD_PREFIX} ostree --repo=${test_tmpdir}/testos-repo rev-parse testos/buildmaster/newbranch)
7070
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.0/usr/bin/content-iteration "1"
7171

0 commit comments

Comments
 (0)