Skip to content
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

[FreeBSD 14] Missing the desktop cause the failure of testcase ovt_verify_status at detecting vmtoolsd user process #587

Merged
merged 9 commits into from
Jun 5, 2024
Merged

[FreeBSD 14] Missing the desktop cause the failure of testcase ovt_verify_status at detecting vmtoolsd user process #587

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b44ea7
Desktop env is not bootup as expected
ZouYuhua Jun 3, 2024
337d878
Desktop env is not bootup as expected
ZouYuhua Jun 3, 2024
7651091
change code as codereview
ZouYuhua Jun 4, 2024
ada90cb
change code as codereview
ZouYuhua Jun 4, 2024
388ea01
change code as codereview
ZouYuhua Jun 4, 2024
79b5012
change code as codereview
ZouYuhua Jun 4, 2024
c151157
change code as codereview
ZouYuhua Jun 4, 2024
efbac8a
change code as codereview
ZouYuhua Jun 4, 2024
a780aaa
change code as codereview
ZouYuhua Jun 4, 2024
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
16 changes: 15 additions & 1 deletion autoinstall/FreeBSD/14/installerconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,28 @@ else
packages_to_install='bash sudo'
fi
ZouYuhua marked this conversation as resolved.
Show resolved Hide resolved

failed_packages=""
for package_to_install in $packages_to_install
do
echo "Install package $package_to_install ..." > /dev/ttyu0
env ASSUME_ALWAYS_YES=YES pkg install -y $package_to_install
ret=$?
if [ $ret == 0 ]
then
then
echo "Succeed to install the package($package_to_install)" > /dev/ttyu0
else
if [ "$failed_packages" == "" ]; then
failed_packages="$package_to_install"
else
failed_packages="$failed_packages $package_to_install"
fi
ZouYuhua marked this conversation as resolved.
Show resolved Hide resolved
echo "Failed to install the package($package_to_install)" > /dev/ttyu0
fi
done

if [ "$failed_packages" == "" ]; then
ZouYuhua marked this conversation as resolved.
Show resolved Hide resolved
echo "Failed to install the packages from ISO repo: $failed_packages" > /dev/ttyu0
fi
# Disable ISO repo and enable default repo
rm -rf /usr/local/etc/pkg/repos/FreeBSD_install_cdrom.conf
env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
Expand All @@ -92,6 +101,11 @@ else
packages_to_install='open-vm-tools-nox11 wget curl e2fsprogs iozone lsblk'
fi
ZouYuhua marked this conversation as resolved.
Show resolved Hide resolved

if [ "$failed_packages" != "" ]; then
packages_to_install="$failed_packages $packages_to_install"
fi
echo "To install the packages from offical repo: $packages_to_install" > /dev/ttyu0

for package_to_install in $packages_to_install
do
ret=1
Expand Down