diff options
| author | torben | 2015-04-13 20:35:35 +0200 |
|---|---|---|
| committer | torben | 2015-04-13 20:35:35 +0200 |
| commit | 25f9f2ebdd4cd65c01306617cb043837a8be3171 (patch) | |
| tree | 6243863b258c17ff5f29c536a83efec486d4890c /testModule | |
| parent | Fix hook priority. (diff) | |
| download | systemd-init-25f9f2ebdd4cd65c01306617cb043837a8be3171.tar.gz systemd-init-25f9f2ebdd4cd65c01306617cb043837a8be3171.tar.xz systemd-init-25f9f2ebdd4cd65c01306617cb043837a8be3171.zip | |
Remove debugging lines.
Diffstat (limited to 'testModule')
| -rw-r--r-- | testModule/hooks/pre-mount.sh | 4 | ||||
| -rw-r--r-- | testModule/hooks/pre-pivot.sh | 2 | ||||
| -rw-r--r-- | testModule/module-setup.sh | 14 |
3 files changed, 11 insertions, 9 deletions
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh index 0bf80e16..b29dbeb4 100644 --- a/testModule/hooks/pre-mount.sh +++ b/testModule/hooks/pre-mount.sh @@ -5,6 +5,6 @@ insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko local dnbd3_device_node="$(dnbd3-client -h 132.230.4.1 -i stage4/torben/test -r 1 -d /dev/dnbd0)" dnbd3_device_node='/dev/dnbd0' # TODO sysroot normally not available yet. -qemu-img create -f qcow2 -o backing_file="$dnbd3_device_node",backing_fmt=qcow2 /sysroot/test.qcow2 +qemu-img create -f qcow2 -o backing_file="$dnbd3_device_node",backing_fmt=qcow2 /test.qcow2 insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko -systemd_preserve_process_marker qemu-nbd -c /dev/nbd0 /sysroot/test.qcow2 +systemd_preserve_process_marker qemu-nbd -c /dev/nbd0 /test.qcow2 diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh index c868fc30..8c013496 100644 --- a/testModule/hooks/pre-pivot.sh +++ b/testModule/hooks/pre-pivot.sh @@ -1,3 +1,3 @@ # TODO warn '............MOUNT.............' -mount /dev/nbd0 /sysroot/mnt +mount /dev/nbd0 /mnt diff --git a/testModule/module-setup.sh b/testModule/module-setup.sh index 698ebf62..158800b4 100644 --- a/testModule/module-setup.sh +++ b/testModule/module-setup.sh @@ -23,26 +23,28 @@ installkernel() { mperf libcrc32c sd_mod crc_t10dif crct10dif_common sr_mod cdrom \ ata_generic pata_acpi ahci libahci vboxvideo drm i2c_core ata_piix \ libata vboxguest dm_mirror dm_region_hash dm_log dm_mod + # Production: instmods ext4 mbcache jbd2 } install() { # Loads globally needed useful functions or fixes some native dracut ones. inst "$moddir/library.sh" /usr/lib/test-library.sh + inst "$moddir/binaries/systemd_preserve_process_marker" /usr/bin/systemd_preserve_process_marker inst "$moddir/binaries/endless" /usr/bin/endless inst "$moddir/binaries/dnbd3-client" /usr/bin/dnbd3-client inst "$moddir/binaries/busybox" /usr/bin/busybox + inst "$moddir/kernel_modules/dnbd3.ko" /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko inst "$moddir/kernel_modules/nbd.ko" /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko + # NOTE: Priority has to be lower than the network cmdline parsing hooks # since we have to modify the some kernel parameter before. inst_hook cmdline 1 "$moddir/hooks/cmdline.sh" - # TODO pre-pivot to pre-mount - inst_hook pre-pivot 10 "$moddir/hooks/pre-mount.sh" - # TODO 11 to 10 - inst_hook pre-pivot 11 "$moddir/hooks/pre-pivot.sh" - #inst_hook pre-mount 20 "$moddir/setup_network.sh" + inst_hook pre-mount 10 "$moddir/hooks/pre-mount.sh" + inst_hook pre-pivot 10 "$moddir/hooks/pre-pivot.sh" + inst_multiple lsblk ping ip ifconfig sshd htop dhclient tail head cat vim touch sed lsmod insmod qemu-img qemu-nbd sleep route wget find - # FINAL: inst_multiple insmod qemu-img qemu-nbd + # Production: inst_multiple insmod qemu-img qemu-nbd return 0 } |