Skip to content

STABLE-9: compat error checking additions #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jean-edouard merged 3 commits into from
Apr 22, 2019
+15 −9
Merged

STABLE-9: compat error checking additions #103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c57e6b2
install-main: Return failure from create_lv
jandryuk Apr 12, 2019
9ce5db8
install-main: Add do_cmd to seal_system
jandryuk Apr 12, 2019
85c3240
install-main: Report mount_upgrade_compat failures
jandryuk Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions part2/stages/Functions/install-main
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ create_lv() {
fi

lvcreate ${dfl_opts} --name ${name} ${opts} ${vg}
ret=$?

udevadm settle

return $ret
}

mk_xc_lvm()
Expand Down Expand Up @@ -475,16 +479,18 @@ seal_system() {
write_config_pcrs "${DOM0_MOUNT}"

if [ "$(uname -m)" = "i686" ]; then
mount_upgrade_compat
/etc/init.d/trousers stop
chroot ${UPGRADE_MOUNT} /usr/sbin/seal-system -f -r ${ROOT_DEV}
/etc/init.d/trousers start
mount_upgrade_compat || return 1
do_cmd /etc/init.d/trousers stop >&2
do_cmd chroot ${UPGRADE_MOUNT} \
/usr/sbin/seal-system -f -r ${ROOT_DEV} >&2
do_cmd /etc/init.d/trousers start >&2
umount_upgrade_compat
do_cmd lvremove -f /dev/xenclient/upgradecompat
do_cmd lvremove -f /dev/xenclient/upgradecompat >&2
else
/etc/init.d/trousers stop
chroot ${DOM0_MOUNT} /usr/sbin/seal-system -f -r ${ROOT_DEV}
/etc/init.d/trousers start
do_cmd /etc/init.d/trousers stop >&2
do_cmd chroot ${DOM0_MOUNT} \
/usr/sbin/seal-system -f -r ${ROOT_DEV} >&2
do_cmd /etc/init.d/trousers start >&2
fi

do_umount_all ${DOM0_MOUNT}
Expand Down Expand Up @@ -607,7 +613,7 @@ mount_config()
install_bootloader_from_dom0fs()
{
if [ "$(uname -m)" = "i686" ]; then
mount_upgrade_compat
mount_upgrade_compat || return 1
do_cmd chroot ${UPGRADE_MOUNT} \
/usr/share/xenclient/install-bootloader "${LANGUAGE}" >&2 || {
echo "Error installing the bootloader">&2
Expand Down