diff options
| author | jandob | 2015-10-29 10:54:12 +0100 |
|---|---|---|
| committer | jandob | 2015-10-29 10:54:12 +0100 |
| commit | 0e3150e11fa895661417417bebfd56cccc482713 (patch) | |
| tree | 16ac38903c33aa9934ce03b1f32b0bda62b00ad0 | |
| parent | documentation (diff) | |
| download | systemd-init-0e3150e11fa895661417417bebfd56cccc482713.tar.gz systemd-init-0e3150e11fa895661417417bebfd56cccc482713.tar.xz systemd-init-0e3150e11fa895661417417bebfd56cccc482713.zip | |
bugfix
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x | build_initramfs.sh (renamed from build_initram_dracut.sh) | 3 | ||||
| -rw-r--r-- | builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko | bin | 463216 -> 0 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | builder/dnbd3-qcow2-rootfs/module-setup.sh | 6 | ||||
| -rwxr-xr-x | dev_tools/startup.nsh | 5 |
5 files changed, 14 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b770329f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +dracut +builder/dnbd3-qcow2-rootfs/kernel_modules +!builder/dnbd3-qcow2-rootfs/kernel_modules/Makefile diff --git a/build_initram_dracut.sh b/build_initramfs.sh index 0eb09cff..f2e5bd86 100755 --- a/build_initram_dracut.sh +++ b/build_initramfs.sh @@ -13,5 +13,8 @@ cp install/dracut-install dracut-install ## if symlinks are available #make dracut-install +# TODO build dnbd3.ko, nbd.ko (dnbd3-qcow2-rootfs/kernel_modules/Makefile) +# TODO add dnbd3-qcow2-rootfs to modules.d + # build initramfs ./dracut.sh -l --verbose --force diff --git a/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko b/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko Binary files differdeleted file mode 100644 index e8c3f40f..00000000 --- a/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko +++ /dev/null diff --git a/builder/dnbd3-qcow2-rootfs/module-setup.sh b/builder/dnbd3-qcow2-rootfs/module-setup.sh index b3f14c1d..c19263a3 100644..100755 --- a/builder/dnbd3-qcow2-rootfs/module-setup.sh +++ b/builder/dnbd3-qcow2-rootfs/module-setup.sh @@ -22,7 +22,7 @@ check() { echo "The nbd-client major version is not 3, meaning its probably too old." return 1 fi - if [ "${nbd_client_version_minor}" -gt 8 ]; then + if [ "${nbd_client_version_minor}" -gt 11 ]; then # TODO check if ver = 3.9 has the same new syntax... echo "The nbd-client minor version is greater than 8. A new syntax has been introduced starting with 3.10 which we do not support." @@ -55,8 +55,8 @@ install() { # NOTE: These modules are build again Kernel: 3.10.0-229.1.2.el7.x86_64 # TODO: build these in check() ! - inst "$moddir/kernel_modules/dnbd3.ko" \ - /usr/lib/modules/current/extra/dnbd3.ko + #inst "$moddir/kernel_modules/dnbd3.ko" \ + #/usr/lib/modules/current/extra/dnbd3.ko inst "$moddir/kernel_modules/nbd.ko" \ /usr/lib/modules/current/extra/nbd.ko diff --git a/dev_tools/startup.nsh b/dev_tools/startup.nsh new file mode 100755 index 00000000..197beb46 --- /dev/null +++ b/dev_tools/startup.nsh @@ -0,0 +1,5 @@ +if exist fs0:\debug then + rm fs0:\debug + \vmlinuz-linux initrd=\initramfs-4.2.2-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" +endif +\vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" |