diff options
| author | torben | 2015-04-14 19:48:02 +0200 |
|---|---|---|
| committer | torben | 2015-04-14 19:48:02 +0200 |
| commit | e4580fca0ae1edb00df7bd02f9833b41e78d83c8 (patch) | |
| tree | ef51a07e49161c810072a75ea5b0a824e5562699 | |
| parent | Adding static qemu-nbd. (diff) | |
| download | systemd-init-e4580fca0ae1edb00df7bd02f9833b41e78d83c8.tar.gz systemd-init-e4580fca0ae1edb00df7bd02f9833b41e78d83c8.tar.xz systemd-init-e4580fca0ae1edb00df7bd02f9833b41e78d83c8.zip | |
Many other tries.
| -rwxr-xr-x | grub2.conf | 2 | ||||
| -rw-r--r-- | testModule/hooks/pre-mount.sh | 4 | ||||
| -rw-r--r-- | testModule/hooks/pre-pivot.sh | 7 | ||||
| -rw-r--r-- | testModule/module-setup.sh | 2 |
4 files changed, 7 insertions, 8 deletions
@@ -7,7 +7,7 @@ menuentry 'test' --class centos --class gnu-linux --class gnu --class os --unres insmod xfs set root='hd0,msdos1' linux16 /vmlinuz-3.10.0-229.1.2.el7.x86_64 ro vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.break root=UUID=6c06919a-389a-4a50-8c6b-b086e65db9b0 rd.udev.log-priority=debug ip=10.0.2.15:132.230.4.2:10.0.2.2:255.255.255.0 # NOTE: Prevents dracut console: console=tty0 console=ttyS0,9600 ip=enp0s3:dhcp root=/dev/nbd0 rootfstype=ext4 - #linux16 /vmlinuz-3.10.0-229.1.2.el7.x86_64 console=tty0 console=ttyS0,9600 ro vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.break rd.debug rd.shell rd.info root=UUID=6c06919a-389a-4a50-8c6b-b086e65db9b0 rd.udev.log-priority=debug ip=10.0.2.15:132.230.4.2:10.0.2.2:255.255.255.0 + #linux16 /vmlinuz-3.10.0-229.1.2.el7.x86_64 ro vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.break rd.debug rd.shell rd.info root=UUID=6c06919a-389a-4a50-8c6b-b086e65db9b0 rd.udev.log-priority=debug ip=10.0.2.15:132.230.4.2:10.0.2.2:255.255.255.0 initrd16 /initramfs-test.img # fully given: selxsrv=132.230.4.2 slxbase=boot/openselx-productive quiet splash vga=current wurstgesicht initrd=http://132.230.4.2/boot/openslx-productive/initramfs-stage31 ip=132.230.4.67:132.230.4.2:132.230.4.254:255.255.255.0 BOOTIF=01-08-00-27-60-49-62 BOOT_IMAGE=http://132.230.4.2/boot/openslx-productive/kernel diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh index 7798622e..210ea26f 100644 --- a/testModule/hooks/pre-mount.sh +++ b/testModule/hooks/pre-mount.sh @@ -4,7 +4,3 @@ warn '............START.............' 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)" -#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 /test.qcow2 diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh index 8b01779a..7fb6cd9d 100644 --- a/testModule/hooks/pre-pivot.sh +++ b/testModule/hooks/pre-pivot.sh @@ -1,12 +1,13 @@ # TODO warn '............MOUNT.............' # TODO -dnbd3_device_node='/dev/dnbd0' mount -o remount,rw /sysroot rm /sysroot/test.qcow2 +dnbd3_device_node='/dev/dnbd0' qemu-img create -f qcow2 -o \ backing_file="$dnbd3_device_node",backing_fmt=qcow2 /sysroot/test.qcow2 insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko -systemd_preserve_process_marker qemu-nbd --connect /dev/nbd0 /sysroot/test.qcow2 --socket /sysroot/var/lock/qemu-nbd-TEST -mount /dev/nbd0 /sysroot/TEST +systemd_preserve_process_marker /usr/bin/qemu-nbd --connect /dev/nbd0 \ + /sysroot/test.qcow2 --socket /sysroot/qemu-nbd-TEST #--aio=native --nocache +#mount /dev/nbd0 /sysroot/TEST # strace -ff -o /sysroot/log.txt -p PID diff --git a/testModule/module-setup.sh b/testModule/module-setup.sh index 0e41856d..4a5c4331 100644 --- a/testModule/module-setup.sh +++ b/testModule/module-setup.sh @@ -32,9 +32,11 @@ install() { inst "$moddir/binaries/systemd_preserve_process_marker" /usr/bin/systemd_preserve_process_marker inst "$moddir/binaries/endless" /usr/bin/endless + 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/binaries/qemu-nbd" /usr/bin/qemu-nbd + inst "$moddir/binaries/qemu-nbd" /usr/bin/@qemu-nbd 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 |