Fixes.

3 files changed, 8 insertions, 7 deletions

diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
index 37a6bd15..12e274ea 100755
--- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
@@ -1,15 +1,15 @@
 source "/usr/lib/utils.sh"
 
-declare -rg DNBD3_SERVER="gateway"
+declare -rg DNBD3_SERVER="10.0.2.2"
 declare -rg DNBD3_IMAGE="archLinux.vdi"
 declare -rg DNBD3_RID="0"
 declare -rg DNBD3_DEVICE="/dev/dnbd0"
 
 # Close previous connections to be able to run this script many times.
-dnbd3-client --device /dev/dnbd0 --close && \
+dnbd3-client --device "$DNBD3_DEVICE" --close && \
 dnbd3-client --host "$DNBD3_SERVER" --image "$DNBD3_IMAGE" --device \
     "$DNBD3_DEVICE" --rid "$DNBD3_RID" && \
-qemu-nbd --connect=/dev/nbd0 /dev/dnbd0 --read-only && \
+qemu-nbd --connect=/dev/nbd0 "$DNBD3_DEVICE" --read-only && \
 local read_only_partition="$(utils_create_partition_via_offset \
     /dev/nbd0 system)" && \
 # Make read-only partition writable.
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index a716cab3..e06d4549 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -77,8 +77,9 @@ install() {
     # Debugging Uncomment this version if you need some useful debugging tools
     # in your iniramfs.
     inst_multiple lsblk ping ip ifconfig sshd htop tail head cat vim \
-        touch sed lsmod insmod qemu-img sleep route wget find lsof strace \
-        chroot switch_root pivot_root qemu-nbd mount fdisk mkfs.xfs
+        touch sed lsmod sleep route wget find lsof strace chroot switch_root \
+        pivot_root mount fdisk mkfs.xfs \
+        insmod qemu-nbd blockdev partx dmsetup cut awk losetup dd
     # Production:
-    # inst_multiple insmod qemu-img qemu-nbd
+    # inst_multiple insmod qemu-nbd blockdev partx dmsetup cut awk losetup dd
 }
diff --git a/dev-tools/startup.nsh b/dev-tools/startup.nsh
index 3cf248c2..84a8adc9 100755
--- a/dev-tools/startup.nsh
+++ b/dev-tools/startup.nsh
@@ -1,5 +1,5 @@
 if exist fs0:\debug then
     rm fs0:\debug
-    \vmlinuz-linux initrd=\initramfs-4.2.5-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.debug rd.break ip=dhcp
+    \vmlinuz-linux initrd=\initramfs-4.2.5-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.debug rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off
 endif
 \vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012"