Skip to content

M
mkimage-profiles
Commit 95264771 authored by Alexey Shabalin's avatar Alexey Shabalin Committed by Michael Shigorin
Browse files
Options

- add virtio modules to initrd

- add output to console=ttS0 for run in cloud
parent ad4bffe9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
bin/tar2fs
View file @ 95264771
...@@ -34,7 +34,7 @@ BOOTPART= ...@@ -34,7 +34,7 @@ BOOTPART=
case "`arch`" in # NB: sudo => no GLOBAL_ will do either; mind qemu-* case "`arch`" in # NB: sudo => no GLOBAL_ will do either; mind qemu-*
*86*) *86*)
# NB: different storage modules might be needed for non-kvm # NB: different storage modules might be needed for non-kvm
INITRD_MODULES="sd_mod ata_piix ahci" INITRD_MODULES="sd_mod ata_piix ahci virtio-scsi virtio-blk"
BLOCKDEV="/dev/sda" # might be /dev/vda for virtio BLOCKDEV="/dev/sda" # might be /dev/vda for virtio
ROOTPART="1" ROOTPART="1"
;; ;;
...@@ -203,6 +203,7 @@ if [ -n "$BOOTPART" ]; then ...@@ -203,6 +203,7 @@ if [ -n "$BOOTPART" ]; then
fi fi
echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk" echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')" KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
chroot "$ROOTFS" make-initrd -k "$KERNEL" chroot "$ROOTFS" make-initrd -k "$KERNEL"
...@@ -220,7 +221,7 @@ delay=1 ...@@ -220,7 +221,7 @@ delay=1
vga=0 vga=0
image=/boot/vmlinuz image=/boot/vmlinuz
initrd=/boot/initrd.img initrd=/boot/initrd.img
append=\"root=$ROOTDEV rootdelay=3 quiet\" append=\"root=$ROOTDEV rootdelay=3 console=tty1 console=ttyS0,115200n8\"
label=linux" label=linux"
cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF cat > "$ROOTFS"/etc/lilo-loop.conf <<-EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment