From 629c6381669bd4acdb1613229cd095881d2d9cd2 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 19 Jan 2016 18:51:09 +0200 Subject: wic: move parts of canned .wks into common.wks.inc In order to give and example of 'include' feature of ks parser and for testing purposes common parts of 3 canned wks files were moved into common.wks.inc Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/canned-wks/common.wks.inc | 3 +++ scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks | 4 +--- scripts/lib/wic/canned-wks/directdisk.wks | 4 +--- scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 4 +--- 4 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 scripts/lib/wic/canned-wks/common.wks.inc (limited to 'scripts/lib/wic/canned-wks') 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 @@ +# This file is included into 3 canned wks files from this directory +part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 +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 @@ # long-description: Creates a partitioned legacy BIOS disk image that the user # can directly dd to boot media. The bootloader configuration source is a user file. - -part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 +include common.wks.inc bootloader --configfile="directdisk-bootloader-config.cfg" 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 @@ # long-description: Creates a partitioned legacy BIOS disk image that the user # can directly dd to boot media. - -part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 +include common.wks.inc bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0" 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 @@ # long-description: Creates a partitioned legacy BIOS disk image that the user # can directly use to boot a qemu machine. - -part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 +include common.wks.inc 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 " -- cgit v1.2.3