diff options
| author | jandob | 2015-11-06 11:20:44 +0100 |
|---|---|---|
| committer | jandob | 2015-11-06 11:20:44 +0100 |
| commit | fd757fd623ef03b357e252985b9e881731a08da1 (patch) | |
| tree | 77f906129788b6955e900d457873cff63ec67e14 | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
| download | systemd-init-fd757fd623ef03b357e252985b9e881731a08da1.tar.gz systemd-init-fd757fd623ef03b357e252985b9e881731a08da1.tar.xz systemd-init-fd757fd623ef03b357e252985b9e881731a08da1.zip | |
fixing bugs
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh | 6 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 3 |
2 files changed, 5 insertions, 4 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 2307be55..8e61f9ee 100755 --- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh @@ -27,9 +27,9 @@ else losetup "$writable_device" persistent_storage.img persistent="P" fi -local size="$(blockdev --getsz "$read_only_partition")" && \ +local partition_size="$(blockdev --getsz "$read_only_partition")" && \ local writable_partition_name="root" && \ local chunksize="1" dmsetup create "$writable_partition_name" --table \ - "0 $partion_size snapshot $read_only_partition $writable_device \ - $persistent $chunksize" + "0 $partition_size snapshot $read_only_partition $writable_device $persistent $chunksize" +warn "dmsetup create $writable_partition_name --table 0 $partition_size snapshot $read_only_partition $writable_device $persistent $chunksize" diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index e06d4549..14d49686 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -79,7 +79,8 @@ install() { 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 + insmod qemu-nbd blockdev partx dmsetup cut awk losetup dd mkfs.ext4 \ + grep # Production: # inst_multiple insmod qemu-nbd blockdev partx dmsetup cut awk losetup dd } |
