diff options
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r-- | scripts/lib/wic/canned-wks/common.wks.inc | 2 | ||||
-rw-r--r-- | scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | 8 | ||||
-rw-r--r-- | scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/wic/canned-wks/common.wks.inc b/scripts/lib/wic/canned-wks/common.wks.inc index 5cf2fd1f3e..89880b417b 100644 --- a/scripts/lib/wic/canned-wks/common.wks.inc +++ b/scripts/lib/wic/canned-wks/common.wks.inc | |||
@@ -1,3 +1,3 @@ | |||
1 | # This file is included into 3 canned wks files from this directory | 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 | 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 | 3 | part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 |
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg index d5a07d2048..c58e74a853 100644 --- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | |||
@@ -12,16 +12,16 @@ DEFAULT Graphics console boot | |||
12 | 12 | ||
13 | LABEL Graphics console boot | 13 | LABEL Graphics console boot |
14 | KERNEL /vmlinuz | 14 | KERNEL /vmlinuz |
15 | APPEND label=boot root=/dev/sda2 rootwait | 15 | APPEND label=boot rootwait |
16 | 16 | ||
17 | LABEL Serial console boot | 17 | LABEL Serial console boot |
18 | KERNEL /vmlinuz | 18 | KERNEL /vmlinuz |
19 | APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200 | 19 | APPEND label=boot rootwait console=ttyS0,115200 |
20 | 20 | ||
21 | LABEL Graphics console install | 21 | LABEL Graphics console install |
22 | KERNEL /vmlinuz | 22 | KERNEL /vmlinuz |
23 | APPEND label=install root=/dev/sda2 rootwait | 23 | APPEND label=install rootwait |
24 | 24 | ||
25 | LABEL Serial console install | 25 | LABEL Serial console install |
26 | KERNEL /vmlinuz | 26 | KERNEL /vmlinuz |
27 | APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200 | 27 | APPEND label=install rootwait console=ttyS0,115200 |
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index db30bbced0..1f8466af29 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks | |||
@@ -4,5 +4,5 @@ | |||
4 | 4 | ||
5 | include common.wks.inc | 5 | include common.wks.inc |
6 | 6 | ||
7 | bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 root=/dev/sda2 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 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " |
8 | 8 | ||