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]fix: install open-vm-tools-nox11 by mistake for freebsd 64bit #580

Merged
merged 5 commits into from
May 23, 2024
Merged

[FreeBSD]fix: install open-vm-tools-nox11 by mistake for freebsd 64bit #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
508ae39
fix: install open-vm-tools-nox11 by mistake for freebsd 64bit
ZouYuhua May 23, 2024
0deb8e2
change code from codereviw
ZouYuhua May 23, 2024
4d659d4
change code from codereviw
ZouYuhua May 23, 2024
017b69a
change code from codereviw
ZouYuhua May 23, 2024
b87f1ef
change code from codereviw
ZouYuhua May 23, 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
12 changes: 8 additions & 4 deletions autoinstall/FreeBSD/13/installerconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0

# We install packages from ISO image
# Different packages between the 32bit image and 64bit image
packages_to_install='bash sudo xorg xf86-video-vmware'
machtype=$(uname -m)
if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
packages_to_install='bash sudo xorg xf86-video-vmware'
else
packages_to_install='bash sudo'
fi
for package_to_install in $packages_to_install
do
echo "Install package $package_to_install ..." > /dev/ttyu0
Expand Down Expand Up @@ -92,12 +97,11 @@ FreeBSD_latest: {
EOF

env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
machtype=$(uname -m)
echo "Machine type is $machtype" > /dev/ttyu0
if [[ "$machtype" =~ 64 ]]; then
if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
packages_to_install='sddm kde5 open-vm-tools xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
else
packages_to_install='open-vm-tools-nox11 xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
packages_to_install='open-vm-tools-nox11 wget curl e2fsprogs iozone lsblk'
fi

for package_to_install in $packages_to_install
Expand Down
8 changes: 4 additions & 4 deletions autoinstall/FreeBSD/14/installerconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ env ASSUME_ALWAYS_YES=YES pkg update -f > /dev/ttyu0
# Different packages between the 32bit image and 64bit image
machtype=$(uname -m)
echo "Machine type is $machtype" > /dev/ttyu0
if [[ "$machtype" =~ 64 ]]; then
if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
packages_to_install='bash sudo xorg kde5 xf86-video-vmware'
else
packages_to_install='bash sudo xf86-video-vmware'
packages_to_install='bash sudo'
fi

for package_to_install in $packages_to_install
Expand All @@ -86,10 +86,10 @@ done
# 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
if [[ "$machtype" =~ 64 ]]; then
if [ "$machtype" == "amd64" ] || [ "$machtype" == "x86_64" ]; then
packages_to_install='sddm open-vm-tools xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
else
packages_to_install='open-vm-tools-nox11 xf86-input-vmmouse wget curl e2fsprogs iozone lsblk'
packages_to_install='open-vm-tools-nox11 wget curl e2fsprogs iozone lsblk'
fi

for package_to_install in $packages_to_install
Expand Down