Skip to content

Commit

Permalink
Fix installation on CoreOS
Browse files Browse the repository at this point in the history
- Fix detection of recent CoreOS
- Fix installation on any version of CoreOS (script attempted to copy a
  file that does not exist anymore in the tools distribution)

Refs xcp-ng/xcp#183
  • Loading branch information
stormi committed Sep 25, 2020
1 parent 0571753 commit ab24ca9
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions mk/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,7 @@ install_coreos()
{
echo "Installing the agent..."
mkdir -p /usr/share/oem/xs/
cp -f ${DATADIR}/xe-daemon \
${DATADIR}/xe-linux-distribution \
${DATADIR}/xe-update-guest-attrs /usr/share/oem/xs/
cp -f ${DATADIR}/xe-daemon ${DATADIR}/xe-linux-distribution /usr/share/oem/xs/
cp -f ${DATADIR}/xen-vcpu-hotplug.rules /etc/udev/rules.d/
cp -f ${DATADIR}/xe-linux-distribution.service /etc/systemd/system/
systemctl enable /etc/systemd/system/xe-linux-distribution.service
Expand All @@ -513,6 +511,7 @@ case "${os_distro}" in
debian|ubuntu|linx|yinhe) select_pkgs_debian ;;
xe-ddk|xe-sdk) select_pkgs_xe ;;
CoreOS) select_pkgs_coreos ;;
"Container Linux by CoreOS") select_pkgs_coreos ;;
*) failure "Unknown Linux distribution \`${os_distro}'." ;;
esac

Expand Down

0 comments on commit ab24ca9

Please sign in to comment.