From a1afb0af3511b827bb726f7cd44fb0d96da2fcd8 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 13 Jan 2014 09:51:52 +0200 Subject: [PATCH] ks: finally switch to setup-ivi This patch makes sure that all the KS files execute the 'setup-ivi-boot' script, which is the installer framework plugin that installs and configures the bootloader and generates the /etc/fstab file, see https://wiki.tizen.org/wiki/IVI/artem-setup-ivi#Bootloader_setup This patch removes the 'efi.post' and 'mbr.post' files, and adds a 'setup-ivi.post' file instead, because now we execute the same script for all image types. The script has internal logic for distinguishing image types and installing the right bootloader. This patch requires 2 other preparational patches, and all 3 patches have to be deployed at once. Change-Id: I7a4cf826a70833c1b394a6399d05353cf51c81bb Signed-off-by: Artem Bityutskiy --- ks/ivi-efi-i586.yaml | 2 +- ks/ivi-mbr-i586-emul.yaml | 2 +- ks/ivi-mbr-i586.yaml | 2 +- ks/ivi-min-efi-i586.yaml | 2 +- ks/ivi-min-mbr-i586.yaml | 2 +- scripts/efi.post | 3 --- scripts/mbr.post | 3 --- scripts/setup-ivi.post | 2 ++ 8 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 scripts/efi.post delete mode 100644 scripts/mbr.post create mode 100644 scripts/setup-ivi.post diff --git a/ks/ivi-efi-i586.yaml b/ks/ivi-efi-i586.yaml index 039ff24..e7c8224 100644 --- a/ks/ivi-efi-i586.yaml +++ b/ks/ivi-efi-i586.yaml @@ -14,4 +14,4 @@ ExtraPackages: - ivi-repos - setup-gummiboot PostScripts: - - efi + - setup-ivi diff --git a/ks/ivi-mbr-i586-emul.yaml b/ks/ivi-mbr-i586-emul.yaml index 9152f98..054e440 100644 --- a/ks/ivi-mbr-i586-emul.yaml +++ b/ks/ivi-mbr-i586-emul.yaml @@ -19,4 +19,4 @@ RemovePackages: - openssh - sdbd PostScripts: - - mbr + - setup-ivi diff --git a/ks/ivi-mbr-i586.yaml b/ks/ivi-mbr-i586.yaml index fa3befc..1fd40a1 100644 --- a/ks/ivi-mbr-i586.yaml +++ b/ks/ivi-mbr-i586.yaml @@ -14,4 +14,4 @@ ExtraPackages: - ivi-repos - setup-extlinux PostScripts: - - mbr + - setup-ivi diff --git a/ks/ivi-min-efi-i586.yaml b/ks/ivi-min-efi-i586.yaml index 487ece8..90f1e10 100644 --- a/ks/ivi-min-efi-i586.yaml +++ b/ks/ivi-min-efi-i586.yaml @@ -15,4 +15,4 @@ ExtraPackages: - setup-gummiboot PostScripts: - base-ivi-minimal - - efi + - setup-ivi diff --git a/ks/ivi-min-mbr-i586.yaml b/ks/ivi-min-mbr-i586.yaml index 6a3e63c..152136e 100644 --- a/ks/ivi-min-mbr-i586.yaml +++ b/ks/ivi-min-mbr-i586.yaml @@ -15,4 +15,4 @@ ExtraPackages: - setup-extlinux PostScripts: - base-ivi-minimal - - mbr + - setup-ivi diff --git a/scripts/efi.post b/scripts/efi.post deleted file mode 100644 index 00df656..0000000 --- a/scripts/efi.post +++ /dev/null @@ -1,3 +0,0 @@ -# efi.post -/usr/sbin/setup-efi-ivi - diff --git a/scripts/mbr.post b/scripts/mbr.post deleted file mode 100644 index e56c174..0000000 --- a/scripts/mbr.post +++ /dev/null @@ -1,3 +0,0 @@ -# mbr.post -/usr/sbin/setup-mbr-ivi - diff --git a/scripts/setup-ivi.post b/scripts/setup-ivi.post new file mode 100644 index 0000000..521ef17 --- /dev/null +++ b/scripts/setup-ivi.post @@ -0,0 +1,2 @@ +# Install and configure the boot-loader, /etc/fstab, and so on +/usr/sbin/setup-ivi-boot -- 2.7.4