diff options
4 files changed, 6 insertions, 9 deletions
diff --git a/scripts/lib/wic/canned-wks/common.wks.inc b/scripts/lib/wic/canned-wks/common.wks.inc new file mode 100644 index 0000000000..5cf2fd1f3e --- /dev/null +++ b/scripts/lib/wic/canned-wks/common.wks.inc | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # This file is included into 3 canned wks files from this directory | ||
| 2 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | ||
| 3 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | ||
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks index 4808d04d4d..3529e05c87 100644 --- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | # long-description: Creates a partitioned legacy BIOS disk image that the user | 2 | # long-description: Creates a partitioned legacy BIOS disk image that the user |
| 3 | # can directly dd to boot media. The bootloader configuration source is a user file. | 3 | # can directly dd to boot media. The bootloader configuration source is a user file. |
| 4 | 4 | ||
| 5 | 5 | include common.wks.inc | |
| 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | ||
| 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | ||
| 8 | 6 | ||
| 9 | bootloader --configfile="directdisk-bootloader-config.cfg" | 7 | bootloader --configfile="directdisk-bootloader-config.cfg" |
| 10 | 8 | ||
diff --git a/scripts/lib/wic/canned-wks/directdisk.wks b/scripts/lib/wic/canned-wks/directdisk.wks index af4c9eadaf..6db74a78b4 100644 --- a/scripts/lib/wic/canned-wks/directdisk.wks +++ b/scripts/lib/wic/canned-wks/directdisk.wks | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | # long-description: Creates a partitioned legacy BIOS disk image that the user | 2 | # long-description: Creates a partitioned legacy BIOS disk image that the user |
| 3 | # can directly dd to boot media. | 3 | # can directly dd to boot media. |
| 4 | 4 | ||
| 5 | 5 | include common.wks.inc | |
| 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | ||
| 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | ||
| 8 | 6 | ||
| 9 | bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0" | 7 | bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0" |
| 10 | 8 | ||
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index 8fc38b54d0..a6518a0f45 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | # long-description: Creates a partitioned legacy BIOS disk image that the user | 2 | # long-description: Creates a partitioned legacy BIOS disk image that the user |
| 3 | # can directly use to boot a qemu machine. | 3 | # can directly use to boot a qemu machine. |
| 4 | 4 | ||
| 5 | 5 | include common.wks.inc | |
| 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | ||
| 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 | ||
| 8 | 6 | ||
| 9 | bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 root=/dev/vda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " | 7 | bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 root=/dev/vda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " |
| 10 | 8 | ||