Skip to content

Commit

Permalink
Two small bug fixes
Browse files Browse the repository at this point in the history
- disabling samba on desktop builds since it delays 1st login and throws out an error in case we have no network (laptop usage)
- disabling broken build target
  • Loading branch information
igorpecovnik committed Dec 6, 2021
1 parent a3db0f4 commit bddce2c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/targets-cli-beta.conf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ rk322x-box edge jammy cli


# Radxa rock-3a
rock-3a legacy jammy cli beta yes
#rock-3a legacy jammy cli beta yes


# Raspberry Pi4
Expand Down
7 changes: 5 additions & 2 deletions lib/distributions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,12 @@ install_common()
UPSTREM_VER=$(dpkg-deb -f "${SDCARD}"/var/cache/apt/archives/linux-u-boot-${BOARD}-${BRANCH}*_${ARCH}.deb Version)
fi
}

call_extension_method "pre_install_kernel_debs" << 'PRE_INSTALL_KERNEL_DEBS'
*called before installing the Armbian-built kernel deb packages*
It is not too late to `unset KERNELSOURCE` here and avoid kernel install.
PRE_INSTALL_KERNEL_DEBS

# install kernel
[[ -n $KERNELSOURCE ]] && {
if [[ "${REPOSITORY_INSTALL}" != *kernel* ]]; then
Expand Down Expand Up @@ -446,6 +446,9 @@ FAMILY_TWEAKS
chroot "${SDCARD}" /bin/bash -c "chown root:messagebus /usr/lib/dbus-1.0/dbus-daemon-launch-helper"
chroot "${SDCARD}" /bin/bash -c "chmod u+s /usr/lib/dbus-1.0/dbus-daemon-launch-helper"

# disable sambe since it hangs when no network is present at boot
chroot "${SDCARD}" /bin/bash -c "systemctl --quiet disable smbd 2> /dev/null"

# disable low-level kernel messages for non betas
if [[ -z $BETA ]]; then
sed -i "s/^#kernel.printk*/kernel.printk/" "${SDCARD}"/etc/sysctl.conf
Expand Down

0 comments on commit bddce2c

Please sign in to comment.