diff options
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh | 4 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh index e73ae5d6..1f8bc05f 100755 --- a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh +++ b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh @@ -1 +1,3 @@ -mount /dev/mapper/root "$NEWROOT" -o subvol=root +mount /dev/mapper/root "$NEWROOT" -o subvol=root && \ +# Write fstab for recognized system partition. +sed --in-place --quiet '/^LABEL=system.*/!s/.*//' /etc/fstab diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 4dd3f3dc..61623b83 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -97,11 +97,12 @@ install() { #inst "$moddir/udev/70-openslx-disk.rules" /etc/udev/rules.d/70-openslx-disk.rules # Debugging: - inst_multiple lsblk ping ip ifconfig sshd htop tail head cat vim \ - 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 mkfs.ext4 \ - grep + inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \ + lsmod sleep route wget find lsof strace chroot switch_root pivot_root \ + mount fdisk mkfs.xfs \ + insmod qemu-nbd blockdev partx dmsetup sed cut awk insmod qemu-nbd \ + blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep # Production: - # inst_multiple insmod qemu-nbd blockdev partx dmsetup cut awk losetup dd + # inst_multiple insmod qemu-nbd blockdev partx dmsetup cat cut awk \ + # losetup dd mkfs.ext4 grep } |