diff options
| -rw-r--r-- | pkg/kernel/generated.go | 19 | ||||
| -rwxr-xr-x | tools/create-gce-image.sh | 26 |
2 files changed, 25 insertions, 20 deletions
diff --git a/pkg/kernel/generated.go b/pkg/kernel/generated.go index a0831a4f7..bdb34f13a 100644 --- a/pkg/kernel/generated.go +++ b/pkg/kernel/generated.go @@ -22,17 +22,20 @@ if [ "$(basename $2)" != "bzImage" ]; then exit 1 fi +sudo umount disk.mnt || true +sudo qemu-nbd -d /dev/nbd0 || true rm -rf disk.mnt disk.raw || true + +sudo modprobe nbd fallocate -l 2G disk.raw -echo -en "o\nn\np\n1\n\n\na\nw\n" | sudo fdisk disk.raw -LODEV="$(sudo losetup -f --show -P disk.raw)" -LODEVPART=$LODEV"p1" -CLEANUP="sudo losetup -d $LODEV; $CLEANUP" -until [ -e $LODEVPART ]; do sleep 1; done -sudo mkfs.ext4 $LODEVPART +sudo qemu-nbd -c /dev/nbd0 --format=raw disk.raw +CLEANUP="sudo qemu-nbd -d /dev/nbd0; $CLEANUP" +echo -en "o\nn\np\n1\n\n\na\nw\n" | sudo fdisk /dev/nbd0 +until [ -e /dev/nbd0p1 ]; do sleep 1; done +sudo mkfs.ext4 /dev/nbd0p1 mkdir -p disk.mnt CLEANUP="rm -rf disk.mnt; $CLEANUP" -sudo mount $LODEVPART disk.mnt +sudo mount /dev/nbd0p1 disk.mnt CLEANUP="sudo umount disk.mnt; $CLEANUP" sudo cp -a $1/. disk.mnt/. sudo cp $2 disk.mnt/vmlinuz @@ -87,5 +90,5 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 $CMDLINE } EOF -sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy $LODEV +sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy /dev/nbd0 ` diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index 834aa7b76..be1d0c889 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -8,8 +8,9 @@ # Prerequisites: # - you need a user-space system, a basic Debian system can be created with: # sudo debootstrap --include=openssh-server,curl,tar,gcc,libc6-dev,time,strace,sudo,less,psmisc,selinux-utils,policycoreutils,checkpolicy,selinux-policy-default stable debian -# - you need grub and maybe something else: +# - you need qemu-nbd, grub and maybe something else: # sudo apt-get install qemu-utils grub-efi +# - you need nbd support in kernel # - you need kernel to use with image (e.g. arch/x86/boot/bzImage) # note: kernel modules are not supported # @@ -59,17 +60,21 @@ if [ "$(basename $2)" != "bzImage" ]; then exit 1 fi +# Clean up after previous unsuccessful run. +sudo umount disk.mnt || true +sudo qemu-nbd -d /dev/nbd0 || true rm -rf disk.mnt disk.raw || true + +sudo modprobe nbd fallocate -l 2G disk.raw -echo -en "o\nn\np\n1\n\n\na\nw\n" | sudo fdisk disk.raw -LODEV="$(sudo losetup -f --show -P disk.raw)" -LODEVPART=$LODEV"p1" -CLEANUP="sudo losetup -d $LODEV; $CLEANUP" -until [ -e $LODEVPART ]; do sleep 1; done -sudo mkfs.ext4 $LODEVPART +sudo qemu-nbd -c /dev/nbd0 --format=raw disk.raw +CLEANUP="sudo qemu-nbd -d /dev/nbd0; $CLEANUP" +echo -en "o\nn\np\n1\n\n\na\nw\n" | sudo fdisk /dev/nbd0 +until [ -e /dev/nbd0p1 ]; do sleep 1; done +sudo mkfs.ext4 /dev/nbd0p1 mkdir -p disk.mnt CLEANUP="rm -rf disk.mnt; $CLEANUP" -sudo mount $LODEVPART disk.mnt +sudo mount /dev/nbd0p1 disk.mnt CLEANUP="sudo umount disk.mnt; $CLEANUP" sudo cp -a $1/. disk.mnt/. sudo cp $2 disk.mnt/vmlinuz @@ -132,7 +137,4 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 $CMDLINE } EOF -sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy $LODEV -#sudo umount disk.mnt -#rm -rf disk.mnt -#sudo losetup -d $LODEV +sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy /dev/nbd0 |