Skip to content

Commit 9c8f86f

Browse files
committed
default bump to v6. switched to systemd-networkd
1 parent d6311a1 commit 9c8f86f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ vm/install:
4343
cp /tmp/before/mirrors/$(MIRRORLIST) /etc/pacman.d/mirrorlist; \
4444
pacstrap /mnt base base-devel linux linux-firmware efibootmgr; \
4545
pacstrap /mnt neovim zsh git wget curl sudo openssh; \
46-
pacstrap /mnt networkmanager; \
4746
genfstab -U /mnt >> /mnt/etc/fstab; \
4847
cp /tmp/before/fuse.conf /mnt/etc/fuse.conf; \
4948
cp /tmp/before/mirrors/$(MIRRORLIST) /mnt/etc/pacman.d/mirrorlist; \
@@ -53,7 +52,7 @@ vm/install:
5352
arch-chroot /mnt sh -c 'locale-gen'; \
5453
arch-chroot /mnt sh -c 'echo \"LANG=en_US.UTF-8\" > /etc/locale.conf'; \
5554
arch-chroot /mnt sh -c 'echo \"$(ARCHHOSTNAME)\" > /etc/hostname'; \
56-
arch-chroot /mnt sh -c 'systemctl enable NetworkManager.service'; \
55+
arch-chroot /mnt sh -c 'systemctl enable systemd-networkd.service'; \
5756
arch-chroot /mnt sh -c 'systemctl enable sshd.service'; \
5857
arch-chroot /mnt sh -c 'useradd -m -G wheel -s /bin/zsh $(ARCHUSER)'; \
5958
arch-chroot /mnt sh -c 'echo -e \"root\nroot\" | passwd $(ARCHUSER)'; \

after/kernelvmwgfx/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SD=`scriptDir`
2020

2121
VER="${1:-}"
2222
if [ -z "$VER" ]; then
23-
VER=`curl -sL "https://cdn.kernel.org/pub/linux/kernel/v5.x" | \
23+
VER=`curl -sL "https://cdn.kernel.org/pub/linux/kernel/v6.x" | \
2424
grep -E "<a href=\"linux-.*\.tar\.xz" | \
2525
sed -e 's/<a href=".*">//g' -e 's/<\/a>//g' | \
2626
awk '{print $1}' | sed -e 's/linux-//g' -e 's/\.tar\.xz//g' | \

after/openvmtools/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ sudo pacman -Sy fuse2 icu iproute2 libdnet libmspack libsigc++ \
2424
python rpcsvc-proto netctl networkmanager cunit \
2525
--noconfirm
2626

27-
git clone https://github.com/vmware/open-vm-tools.git
27+
VER="${1:-}"
28+
VMURL="https://github.com/vmware/open-vm-tools.git"
29+
if [ ! -z $VER ]; then
30+
VMURL="https://github.com/vmware/open-vm-tools.git --branch=$VER"
31+
fi
32+
git clone $VMURL
2833
cd open-vm-tools/open-vm-tools
2934
autoreconf -i
3035
./configure \

0 commit comments

Comments
 (0)