diff --git a/README.md b/README.md index 15cc949..50b627d 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Note that currently the install process requires UART to modify the u-boot env f sync; reboot ``` -8. At this point you can remove the HDD/SSD you used, and enjoy Debian 12 with OpenMediaVault on your UNVR Pro! +8. At this point you can remove the HDD/SSD you used, and enjoy Debian 12 with OpenMediaVault on your UNVR Pro! Default login for OpenMediaVault is `admin:openmediavault`. SSH login information is `debian:debian`. ## Removal @@ -87,8 +87,6 @@ To restore back to the factory UNVR-Pro firmware, you can do the following steps * OpenMediaVault * BTRFS does not work, period * No kernel module in UBNT kernel, need new kernel source and we can make so many things better... -* Networking - * SFP+ port works, but cloud-init doesn't configure it, so it needs manual setup * Fans * No service monitoring temps to adjust fan speed, so fans just stay at low spin from u-boot. Fans are on an i2c adt7475 controller * Reset Button diff --git a/overlay/filesystem/etc/cloud/cloud.cfg.d/99-none-omv-setup.cfg b/overlay/filesystem/etc/cloud/cloud.cfg.d/99-none-omv-setup.cfg index 2484078..f100942 100644 --- a/overlay/filesystem/etc/cloud/cloud.cfg.d/99-none-omv-setup.cfg +++ b/overlay/filesystem/etc/cloud/cloud.cfg.d/99-none-omv-setup.cfg @@ -13,3 +13,13 @@ datasource: - DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -f -y - omv-confdbadm populate - omv-salt deploy run hosts + - usermod -a -G _ssh debian + +# Setup network for both nics +network: + version: 2 + ethernets: + enp0s1: + dhcp4: true + enp0s2: + dhcp4: true diff --git a/scripts/docker/run_debootstrap.sh b/scripts/docker/run_debootstrap.sh index 7e46036..7164461 100755 --- a/scripts/docker/run_debootstrap.sh +++ b/scripts/docker/run_debootstrap.sh @@ -44,13 +44,14 @@ console-common console-data/keymap/full select us # Copy over stuff for ulcmd, this is hacky, but that's this ENTIRE repo for you mv "${build_path}/fw-extract/rootfs/lib/systemd/system/ulcmd.service" "${build_path}/rootfs/lib/systemd/system/ulcmd.service" -mv "${build_path}/fw-extract/rootfs/usr/bin/ulcmd" "${build_path}/rootfs/usr/bin/ulcmd" -mkdir -p "${build_path}/rootfs/usr/lib/ubnt-fw/" +mv "${build_path}/fw-extract/rootfs/usr/bin/ulcmd" "${build_path}/rootfs/usr/bin/ulcmd" # LCD controller +mv "${build_path}/fw-extract/rootfs/usr/share/firmware" "${build_path}/rootfs/usr/share/" # LCD panel firmwares +mkdir -p "${build_path}/rootfs/usr/lib/ubnt-fw/" # Home for ulcmd libraries for file in libgrpc++.so.1 libgrpc.so.10 libprotobuf.so.23 \ libssl.so.1.1 libcrypto.so.1.1 libabsl*.so.20200923 libatomic.so.1; do - mv ${build_path}/fw-extract/rootfs/usr/lib/aarch64-linux-gnu/${file} "${build_path}/rootfs/usr/lib/ubnt-fw/" + cp -H ${build_path}/fw-extract/rootfs/usr/lib/aarch64-linux-gnu/${file} "${build_path}/rootfs/usr/lib/ubnt-fw/" done -sed -i 's|Type=simple|Type=simple\nEnvironment="LD_LIBRARY_PATH=/usr/lib/ubnt-fw"|g' "${build_path}/rootfs/lib/systemd/system/ulcmd.service" +sed -i 's|Type=simple|Type=simple\nEnvironment="LD_LIBRARY_PATH=/usr/lib/ubnt-fw"|g' "${build_path}/rootfs/lib/systemd/system/ulcmd.service" # Add library path # Kick off bash setup script within chroot cp ${docker_scripts_path}/bootstrap/001-bootstrap ${build_path}/rootfs/bootstrap