Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Mon Jun 14 00:34:02 CEST 2010.
--------
--- kiwi/kiwi.changes 2010-06-08 17:33:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-06-11 14:59:46.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Jun 9 12:40:39 CEST 2010 - ms@suse.de
+
+- v4.41
+- added oem-dumphalt element which reboots the system after
+ the image was dumped (installed) on the target device. A
+ message appears and the system waits for a key event before
+ reboot (bnc #613180)
+- also search for pattern file name in repomd.xml
+- reduce the scope of the eval around the config.xml file parsing.
+ The only operation that may fail with an exception is the parsing,
+ while accessing the resulting document does not generate
+ exceptions, thus the eval (exception handling) should only
+ enclose the code that actually may trigger an exception
+- improve the XML validation error reporting if jing
+ is installed on the system
+- added oem-unattended element which allows unattended
+ installation if possible
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.RaKcuW/_old 2010-06-14 00:33:40.000000000 +0200
+++ /var/tmp/diff_new_pack.RaKcuW/_new 2010-06-14 00:33:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 4.40)
+# spec file for package kiwi (Version 4.41)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -60,7 +60,7 @@
Requires: clicfs
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.40
+Version: 4.41
Release: 1
Group: System/Management
License: GPLv2
++++++ kiwi-docu.tar.bz2 ++++++
kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2010-06-08 17:29:39.000000000 +0200
+++ new/kiwi/.revision 2010-06-11 14:54:02.000000000 +0200
@@ -1 +1 @@
-b822dbc8f0aa7b7bd5091980ce7a53dd2f8e8a4b
+e61cda1fac02a85729510b79299833b97e2f26c8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2010-06-08 17:29:39.000000000 +0200
+++ new/kiwi/kiwi.pl 2010-06-11 14:54:02.000000000 +0200
@@ -45,7 +45,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "4.40";
+our $Version = "4.41";
our $Publisher = "SUSE LINUX Products GmbH";
our $Preparer = "KIWI - http://kiwi.berlios.de";
our $openSUSE = "http://download.opensuse.org";
@@ -1758,6 +1758,7 @@
my $solfile;
my $satlist;
my $solp;
+ my $rpat;
#==========================================
# Create info block description
#------------------------------------------
@@ -1867,18 +1868,18 @@
#------------------------------------------
/^repo-patterns/ && do {
if (! $meta) {
- ($meta,$delete,$solfile,$satlist) = $xml->getInstallSize();
+ ($meta,$delete,$solfile,$satlist,$solp,$rpat) =
+ $xml->getInstallSize();
if (! $meta) {
$kiwi -> failed();
cleanMount();
exit 1;
}
}
- if (-f $solfile) {
- my @patterns = qxx (
- "dumpsolv $solfile|grep 'name: pattern'|cut -f4 -d :"
- );
- foreach my $p (@patterns) {
+ if (! $rpat) {
+ $kiwi -> info ("No patterns in repo solvable\n");
+ } else {
+ foreach my $p (@{$rpat}) {
next if ($p eq "\n");
$p =~ s/^\s+//;
$p =~ s/\s+$//;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/ar/LC_MESSAGES/kiwi.po new/kiwi/locale/ar/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/ar/LC_MESSAGES/kiwi.po 2010-05-12 16:31:20.000000000 +0200
+++ new/kiwi/locale/ar/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -63,10 +63,10 @@
msgid "Exit"
msgstr "إنهاء"
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/cs/LC_MESSAGES/kiwi.po new/kiwi/locale/cs/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/cs/LC_MESSAGES/kiwi.po 2010-05-12 16:31:21.000000000 +0200
+++ new/kiwi/locale/cs/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -71,10 +71,10 @@
msgid "Exit"
msgstr ""
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/de/LC_MESSAGES/kiwi.po new/kiwi/locale/de/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/de/LC_MESSAGES/kiwi.po 2010-05-12 16:31:21.000000000 +0200
+++ new/kiwi/locale/de/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -66,10 +66,10 @@
msgid "Exit"
msgstr "Exit"
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/el/LC_MESSAGES/kiwi.po new/kiwi/locale/el/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/el/LC_MESSAGES/kiwi.po 2010-05-12 16:31:21.000000000 +0200
+++ new/kiwi/locale/el/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -69,10 +69,10 @@
msgid "Exit"
msgstr ""
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/es/LC_MESSAGES/kiwi.po new/kiwi/locale/es/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/es/LC_MESSAGES/kiwi.po 2010-05-12 16:31:21.000000000 +0200
+++ new/kiwi/locale/es/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -69,10 +69,12 @@
msgid "Exit"
msgstr "Salir"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Porfavor extraiga el CD/DVD de instalación antes de continuar"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Porfavor retire la memoria USB de instalación antes de continuar"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/fi/LC_MESSAGES/kiwi.po new/kiwi/locale/fi/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/fi/LC_MESSAGES/kiwi.po 2010-05-12 16:31:22.000000000 +0200
+++ new/kiwi/locale/fi/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -73,10 +73,12 @@
msgid "Exit"
msgstr "Lopeta"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Poista asennus-CD/DVD ennen jatkamista"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Poista asennus-USB-tikku ennen jatkamista"
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/fr/LC_MESSAGES/kiwi.po new/kiwi/locale/fr/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/fr/LC_MESSAGES/kiwi.po 2010-05-12 16:31:22.000000000 +0200
+++ new/kiwi/locale/fr/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -66,10 +66,12 @@
msgid "Exit"
msgstr "Sortir"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Veuillez éjecter le CD/DVD d'installation avant de continuer"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Veuillez retirer la clé USB d'installation avant de continuer"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/hu/LC_MESSAGES/kiwi.po new/kiwi/locale/hu/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/hu/LC_MESSAGES/kiwi.po 2010-05-12 16:31:23.000000000 +0200
+++ new/kiwi/locale/hu/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -67,10 +67,12 @@
msgid "Exit"
msgstr "Kilépés"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Folytatás előtt kérem vegye ki a telepítő CD/DVD-t a meghajtóból"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr ""
"Folytatás előtt kérem vegye ki a telepítő USB pendrive-ot a meghajtóból"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/it/LC_MESSAGES/kiwi.po new/kiwi/locale/it/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/it/LC_MESSAGES/kiwi.po 2010-05-12 16:31:23.000000000 +0200
+++ new/kiwi/locale/it/LC_MESSAGES/kiwi.po 2010-06-11 14:54:03.000000000 +0200
@@ -66,10 +66,12 @@
msgid "Exit"
msgstr "Esci"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Per favore espelli il CD/DVD di installazione prima di continuare"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr ""
"Per favore tira via la pennatta USB di installazione prima di continuare"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/ja/LC_MESSAGES/kiwi.po new/kiwi/locale/ja/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/ja/LC_MESSAGES/kiwi.po 2010-05-12 16:31:23.000000000 +0200
+++ new/kiwi/locale/ja/LC_MESSAGES/kiwi.po 2010-06-11 14:54:04.000000000 +0200
@@ -67,10 +67,12 @@
msgid "Exit"
msgstr "終了"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "続行するには、インストール CD/DVD を取り出してください"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "続行するには、インストール USB メモリを取り出してください"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/kiwi-template/kiwi.pot new/kiwi/locale/kiwi-template/kiwi.pot
--- old/kiwi/locale/kiwi-template/kiwi.pot 2010-05-12 16:31:26.000000000 +0200
+++ new/kiwi/locale/kiwi-template/kiwi.pot 2010-06-11 14:54:04.000000000 +0200
@@ -65,10 +65,10 @@
msgid "Exit"
msgstr ""
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/ko/LC_MESSAGES/kiwi.po new/kiwi/locale/ko/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/ko/LC_MESSAGES/kiwi.po 2010-05-12 16:31:23.000000000 +0200
+++ new/kiwi/locale/ko/LC_MESSAGES/kiwi.po 2010-06-11 14:54:04.000000000 +0200
@@ -65,10 +65,12 @@
msgid "Exit"
msgstr "종료"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "계속하기전에 설치 CD/DVD를 꺼내주세요."
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "계속하기 전에 설치 USB 스틱을 뽑아주세요."
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/nl/LC_MESSAGES/kiwi.po new/kiwi/locale/nl/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/nl/LC_MESSAGES/kiwi.po 2010-05-12 16:31:24.000000000 +0200
+++ new/kiwi/locale/nl/LC_MESSAGES/kiwi.po 2010-06-11 14:54:04.000000000 +0200
@@ -73,10 +73,12 @@
msgid "Exit"
msgstr "Stoppen"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Gaarne de installatie cd/dvd uitwerpen alvorens door te gaan"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "De installatie USB-stick verwijderen alvorens verder te gaan"
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/pl/LC_MESSAGES/kiwi.po new/kiwi/locale/pl/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/pl/LC_MESSAGES/kiwi.po 2010-05-12 16:31:24.000000000 +0200
+++ new/kiwi/locale/pl/LC_MESSAGES/kiwi.po 2010-06-11 14:54:04.000000000 +0200
@@ -72,10 +72,12 @@
msgid "Exit"
msgstr "Wyjście"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Proszę wyjąć płytę instalacyjnę przed kontynuowaniem"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Proszę odłączyć klucz USB przed kontynuowanie"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po new/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po 2010-05-12 16:31:24.000000000 +0200
+++ new/kiwi/locale/pt_BR/LC_MESSAGES/kiwi.po 2010-06-11 14:54:05.000000000 +0200
@@ -71,10 +71,12 @@
msgid "Exit"
msgstr "Sair"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Por favor, ejete o CD/DVD de instalação antes de continuar"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Por favor, remova o pendrive USB de instalação antes de continuar"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/ru/LC_MESSAGES/kiwi.po new/kiwi/locale/ru/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/ru/LC_MESSAGES/kiwi.po 2010-05-12 16:31:24.000000000 +0200
+++ new/kiwi/locale/ru/LC_MESSAGES/kiwi.po 2010-06-11 14:54:05.000000000 +0200
@@ -63,10 +63,12 @@
msgid "Exit"
msgstr "Выход"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Перед продолжением извлеките установочный CD/DVD"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Перед продолжением извлеките установочный USB"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/sv/LC_MESSAGES/kiwi.po new/kiwi/locale/sv/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2010-05-12 16:31:24.000000000 +0200
+++ new/kiwi/locale/sv/LC_MESSAGES/kiwi.po 2010-06-11 14:54:05.000000000 +0200
@@ -75,10 +75,10 @@
msgid "Exit"
msgstr ""
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/tr/LC_MESSAGES/kiwi.po new/kiwi/locale/tr/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/tr/LC_MESSAGES/kiwi.po 2010-05-12 16:31:25.000000000 +0200
+++ new/kiwi/locale/tr/LC_MESSAGES/kiwi.po 2010-06-11 14:54:05.000000000 +0200
@@ -63,10 +63,10 @@
msgid "Exit"
msgstr "Çık"
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/uk/LC_MESSAGES/kiwi.po new/kiwi/locale/uk/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/uk/LC_MESSAGES/kiwi.po 2010-05-12 16:31:25.000000000 +0200
+++ new/kiwi/locale/uk/LC_MESSAGES/kiwi.po 2010-06-11 14:54:05.000000000 +0200
@@ -76,10 +76,12 @@
msgid "Exit"
msgstr "Вийти"
-msgid "Please eject the install CD/DVD before continuing"
+#, fuzzy
+msgid "Please remove the CD/DVD before reboot"
msgstr "Будь ласка, виштовхніть носій встановлення перш ніж продовжити"
-msgid "Please pull out the install USB stick before continuing"
+#, fuzzy
+msgid "Please unplug the USB stick before reboot"
msgstr "Перш ніж продовжити, будь ласка, вийміть USB-брусок встановлення"
msgid "Installation..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po new/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po 2010-05-12 16:31:25.000000000 +0200
+++ new/kiwi/locale/zh_CN/LC_MESSAGES/kiwi.po 2010-06-11 14:54:05.000000000 +0200
@@ -77,10 +77,10 @@
msgid "Exit"
msgstr ""
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/zh_TW/LC_MESSAGES/kiwi.po new/kiwi/locale/zh_TW/LC_MESSAGES/kiwi.po
--- old/kiwi/locale/zh_TW/LC_MESSAGES/kiwi.po 2010-05-12 16:31:25.000000000 +0200
+++ new/kiwi/locale/zh_TW/LC_MESSAGES/kiwi.po 2010-06-11 14:54:06.000000000 +0200
@@ -75,10 +75,10 @@
msgid "Exit"
msgstr ""
-msgid "Please eject the install CD/DVD before continuing"
+msgid "Please remove the CD/DVD before reboot"
msgstr ""
-msgid "Please pull out the install USB stick before continuing"
+msgid "Please unplug the USB stick before reboot"
msgstr ""
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh
--- old/kiwi/modules/KIWIConfig.sh 2010-06-04 10:37:36.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2010-06-11 14:54:06.000000000 +0200
@@ -218,6 +218,14 @@
echo "Setting up OEM_REBOOT=1"
echo "OEM_REBOOT=1" >> $oemfile
fi
+ if [ ! -z "$kiwi_oemdumphalt" ];then
+ echo "Setting up OEM_DUMPHALT=1"
+ echo "OEM_DUMPHALT=1" >> $oemfile
+ fi
+ if [ ! -z "kiwi_oemunattended" ];then
+ echo "Setting up OEM_UNATTENDED=1"
+ echo "OEM_UNATTENDED=1" >> $oemfile
+ fi
if [ ! -z "$kiwi_oemswap" ];then
echo "Setting up OEM_WITHOUTSWAP=1"
echo "OEM_WITHOUTSWAP=1" >> $oemfile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2010-06-04 10:37:36.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2010-06-11 14:54:06.000000000 +0200
@@ -949,6 +949,8 @@
$main::ForeignRepo{"oem-boot-title"} = $xml -> getOEMBootTitle();
$main::ForeignRepo{"oem-kiwi-initrd"}= $xml -> getOEMKiwiInitrd();
$main::ForeignRepo{"oem-reboot"} = $xml -> getOEMReboot();
+ $main::ForeignRepo{"oem-dumphalt"} = $xml -> getOEMDumpHalt();
+ $main::ForeignRepo{"oem-unattended"} = $xml -> getOEMUnattended();
$main::ForeignRepo{"oem-recovery"} = $xml -> getOEMRecovery();
$main::ForeignRepo{"oem-recoveryID"} = $xml -> getOEMRecoveryID();
$main::ForeignRepo{"displayname"} = $xml -> getImageDisplayName();
@@ -2797,6 +2799,8 @@
$main::ForeignRepo{"oem-boot-title"} = $xml -> getOEMBootTitle();
$main::ForeignRepo{"oem-kiwi-initrd"}= $xml -> getOEMKiwiInitrd();
$main::ForeignRepo{"oem-reboot"} = $xml -> getOEMReboot();
+ $main::ForeignRepo{"oem-dumphalt"} = $xml -> getOEMDumpHalt();
+ $main::ForeignRepo{"oem-unattended"} = $xml -> getOEMUnattended();
$main::ForeignRepo{"oem-recovery"} = $xml -> getOEMRecovery();
$main::ForeignRepo{"oem-recoveryID"} = $xml -> getOEMRecoveryID();
$main::ForeignRepo{"displayname"} = $xml -> getImageDisplayName();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2010-06-04 10:37:36.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2010-06-11 14:54:06.000000000 +0200
@@ -4682,6 +4682,9 @@
if [ -f /.profile ];then
importFile < /.profile
fi
+ if [ ! -z "$kiwi_oemunattended" ] && [ "$DIALOG_LANG" = "ask" ];then
+ DIALOG_LANG=en_US
+ fi
if [ "$DIALOG_LANG" = "ask" ];then
for code in $(echo $kiwi_language | tr "," " ");do
if [ $code = "en_US" ];then
@@ -4724,9 +4727,9 @@
export TEXT_INSTALLTITLE=$(
getText "Installation...")
export TEXT_CDPULL=$(
- getText "Please eject the install CD/DVD before continuing")
+ getText "Please remove the CD/DVD before reboot")
export TEXT_USBPULL=$(
- getText "Please pull out the install USB stick before continuing")
+ getText "Please unplug the USB stick before reboot")
export TEXT_SELECT=$(
getText "Select disk for installation:")
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc
--- old/kiwi/modules/KIWISchema.rnc 2010-05-21 15:52:45.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rnc 2010-06-11 14:54:06.000000000 +0200
@@ -1087,6 +1087,46 @@
}
#==========================================
+# common element <oem-dumphalt>
+#
+div {
+ k.oem-dumphalt.content = xsd:boolean
+ k.oem-dumphalt.attlist = empty
+ k.oem-dumphalt =
+ ## For oemboot driven images: reboot after image dump yes/no
+ [
+ db:para [
+ "For oemboot driven images: reboot the system after image\x{a}"~
+ "has been dumped (installed) on the target disk. A message\x{a}"~
+ "appears and the system waits for a key event before reboot"
+ ]
+ ]
+ element oem-dumphalt {
+ k.oem-dumphalt.attlist,
+ k.oem-dumphalt.content
+ }
+}
+
+#==========================================
+# common element <oem-unattended>
+#
+div {
+ k.oem-unattended.content = xsd:boolean
+ k.oem-unattended.attlist = empty
+ k.oem-unattended =
+ ## For oemboot driven images: don't ask questions if possible y/n
+ [
+ db:para [
+ "For oemboot driven images: don't ask questions if possible y/n"
+ ]
+ ]
+ element oem-unattended {
+ k.oem-unattended.attlist,
+ k.oem-unattended.content
+ }
+}
+
+#==========================================
# common element <size>
#
div {
@@ -1964,7 +2004,9 @@
k.oem-swapsize? &
k.oem-recovery? &
k.oem-recoveryID? &
- k.oem-reboot?
+ k.oem-reboot? &
+ k.oem-dumphalt? &
+ k.oem-unattended?
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng
--- old/kiwi/modules/KIWISchema.rng 2010-05-21 15:52:45.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rng 2010-06-11 14:54:06.000000000 +0200
@@ -1510,6 +1510,50 @@
</div>
<!--
==========================================
+ common element <oem-dumphalt>
+
+ -->
+ <div>
+ <define name="k.oem-dumphalt.content">
+ <data type="boolean"/>
+ </define>
+ <define name="k.oem-dumphalt.attlist">
+ <empty/>
+ </define>
+ <define name="k.oem-dumphalt">
+ <element name="oem-dumphalt">
+