Mailinglist Archive: opensuse-commit (1082 mails)
| < Previous | Next > |
commit kiwi
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 07 May 2007 18:13:50 +0200
- Message-id: <20070507161350.61010678184@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kiwi
checked in at Mon May 7 18:13:50 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-04-27 15:46:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-05-07 15:13:47.881889000 +0200
@@ -1,0 +2,17 @@
+Wed May 2 14:35:59 CEST 2007 - ms@xxxxxxx
+
+- v1.31
+- fixed option -c / -C clash
+- fixed pattern support for -32bit patterns
+- added maintenance chapter to kiwi documentation
+- added missing inherit attribute to KIWIScheme.xsd
+- fixed --list option, method listImage()
+- prevent mounting the system (/) path to the image chroot (#270945)
+ kiwi will bind mount the repository location only. The bind mount
+ now also happens on _local_ repository references only
+- added --add-repo and --add-repotype option to kiwi. This allows
+ you to specify an additional repository used within a prepare
+ or upgrade process. The information will not be written to the
+ config.xml file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.y25879/_old 2007-05-07 18:13:38.000000000 +0200
+++ /var/tmp/diff_new_pack.y25879/_new 2007-05-07 18:13:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 1.30)
+# spec file for package kiwi (Version 1.31)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux
Requires: perl perl-XML-LibXML perl-libwww-perl screen
Summary: OpenSuSE - KIWI Image System
-Version: 1.30
+Version: 1.31
Release: 1
Group: System/Management
License: GNU General Public License (GPL)
@@ -288,6 +288,20 @@
%{_datadir}/kiwi/image/xenboot
%changelog
+* Wed May 02 2007 - ms@xxxxxxx
+- v1.31
+- fixed option -c / -C clash
+- fixed pattern support for -32bit patterns
+- added maintenance chapter to kiwi documentation
+- added missing inherit attribute to KIWIScheme.xsd
+- fixed --list option, method listImage()
+- prevent mounting the system (/) path to the image chroot (#270945)
+ kiwi will bind mount the repository location only. The bind mount
+ now also happens on _local_ repository references only
+- added --add-repo and --add-repotype option to kiwi. This allows
+ you to specify an additional repository used within a prepare
+ or upgrade process. The information will not be written to the
+ config.xml file
* Thu Apr 26 2007 - ms@xxxxxxx
- v1.30
- added XML version validation, current XSD version 1.2
++++++ kiwi.tar.bz2 ++++++
Files old/kiwi/doc/kiwi.pdf and new/kiwi/doc/kiwi.pdf differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/doc/kiwi.tex new/kiwi/doc/kiwi.tex
--- old/kiwi/doc/kiwi.tex 2007-04-19 14:10:16.000000000 +0200
+++ new/kiwi/doc/kiwi.tex 2007-05-07 11:40:25.000000000 +0200
@@ -130,6 +130,7 @@
\input image
\input activate
\input deploy
+\input maintenance
\input trouble
\printindex
\end{document}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/doc/maintenance.tex new/kiwi/doc/maintenance.tex
--- old/kiwi/doc/maintenance.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/doc/maintenance.tex 2007-05-07 11:40:25.000000000 +0200
@@ -0,0 +1,45 @@
+\index{KIWI images!maintenance|(}
+\chapter{Maintenance of Operating System Images}
+\label{chapter:maintain}
+\minitoc
+
+Creating an image often results in an appliance solution for a
+customer and gives you the freedom of a working solution at that
+time. But software develops and you don't want your solution to
+become outdated. Because of this together with an image people always
+should think of \textbf{image-maintenance}. The following paragraph
+just reflects ideas how to maintain images created by kiwi:
+
+\begin{figure}[h]
+\centering
+\includegraphics[scale=0.5]{pictures/maintain.eps}
+\caption{Image maintenance scenarios}
+\label{fig:maintenance}
+\end{figure}
+
+The picture above shows two possible scenarios which requires an
+image to become updated. The first reason for updating an image
+are changes to the software, for example a new kernel should be
+used. If this change doesn't require additional software or changes
+in the configuration the update can be done by kiwi itself using
+its \textbf{upgrade} option. In combination with \textbf{upgrade}
+kiwi allows to add an additional repository which may be needed if
+the updated software is not part of the original repository. An
+important thing to know is that this additional repository is \textbf{not}
+stored into the original config.xml file of the image description.
+
+Another reason for updating an image beside software updates are
+configuration changes or enhancements, for example an image should
+have replaced its browser with another better browser or a new service
+like apache should be enabled. In principal it's possible to do all
+those changes manually within the physical extend but concerning
+maintenance this would be a nightmare. Why, because it will leave the
+system in an unversioned condition. Nobody knows what has changed
+since the very first preparation of this image. So in short
+\textbf{dont't modify physical extends manually}. Changes to the image
+configuration should be done within the image description. The
+image description itself should be part of a versioning system like
+subversion. All changes can be tracked down then and maybe more
+important can be assigned to product tags and branches. As a consequence
+an image must be prepared from scratch and the old physical extend
+could be removed.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/doc/pictures/fig/maintain.fig new/kiwi/doc/pictures/fig/maintain.fig
--- old/kiwi/doc/pictures/fig/maintain.fig 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/doc/pictures/fig/maintain.fig 2007-05-07 11:40:25.000000000 +0200
@@ -0,0 +1,95 @@
+#FIG 3.2
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+6 6840 0 10305 1575
+3 3 0 1 0 7 50 -1 -1 0.000 0 0 0 14
+ 7515 945 6975 720 7965 180 8685 45 8910 315 9450 270
+ 9585 495 10215 540 9855 1080 9270 1080 9225 1485 7875 1395
+ 7515 1215 7785 1035
+ -1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000
+ -1.000 -1.000 -1.000 -1.000 -1.000 -1.000
+4 0 0 50 -1 2 20 0.0000 4 255 2295 7425 810 Software package\001
+4 0 0 50 -1 2 20 0.0000 4 195 885 8055 1170 Source\001
+-6
+6 2205 720 6660 2475
+2 4 0 1 0 0 50 -1 20 0.000 0 0 7 0 0 5
+ 6660 2475 2340 2475 2340 855 6660 855 6660 2475
+2 4 0 1 0 7 50 -1 18 0.000 0 0 7 0 0 5
+ 6525 2340 2205 2340 2205 720 6525 720 6525 2340
+4 0 0 50 -1 2 18 0.0000 4 240 3465 2385 1440 versioning system like SVN to\001
+4 0 0 50 -1 2 18 0.0000 4 240 3690 2385 2070 OS-Images in product branches\001
+4 0 0 50 -1 2 18 0.0000 4 240 3885 2385 1755 track down changes and organize\001
+4 0 0 50 -1 2 18 0.0000 4 240 3525 2385 1080 Image Description as part of a\001
+-6
+6 5400 9630 8640 10440
+2 4 0 1 0 0 50 -1 20 0.000 0 0 7 0 0 5
+ 8640 10440 5535 10440 5535 9765 8640 9765 8640 10440
+2 4 0 1 0 7 50 -1 18 0.000 0 0 7 0 0 5
+ 8505 10305 5400 10305 5400 9630 8505 9630 8505 10305
+4 0 0 50 -1 2 25 0.0000 4 270 2355 5670 10080 kiwi --create ...\001
+-6
+6 5400 2790 8640 3600
+2 4 0 1 0 0 50 -1 20 0.000 0 0 7 0 0 5
+ 8640 3600 5535 3600 5535 2925 8640 2925 8640 3600
+2 4 0 1 0 7 50 -1 18 0.000 0 0 7 0 0 5
+ 8505 3465 5400 3465 5400 2790 8505 2790 8505 3465
+4 0 0 50 -1 2 25 0.0000 4 360 2655 5670 3240 kiwi --prepare ...\001
+-6
+6 4185 6705 9900 8100
+6 4410 6840 9180 8055
+4 0 0 50 -1 2 18 0.0000 4 225 1350 4410 7020 Scenario B)\001
+4 0 0 50 -1 2 18 0.0000 4 240 3120 4410 7650 Image Description changes\001
+4 0 0 50 -1 2 18 0.0000 4 240 1965 4410 7965 kiwi --prepare ...\001
+4 0 0 50 -1 2 18 0.0000 4 240 4755 4410 7335 Software package Source changes and/or\001
+-6
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+ 9900 8100 9900 6705 4185 6705 4185 8100 9900 8100
+-6
+6 4185 4275 9900 5490
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+ 9900 5490 9900 4275 4185 4275 4185 5490 9900 5490
+4 0 0 50 -1 2 18 0.0000 4 225 1365 4365 4590 Scenario A)\001
+4 0 0 50 -1 2 18 0.0000 4 240 3915 4365 4905 Software package Source changes\001
+4 0 0 50 -1 2 18 0.0000 4 240 5115 4365 5220 kiwi --upgrade --add-repo ... --add-repotype\001
+-6
+2 4 0 1 0 0 50 -1 20 0.000 0 0 7 0 0 5
+ 12510 9315 7740 9315 7740 8325 12510 8325 12510 9315
+2 4 0 1 0 7 50 -1 18 0.000 0 0 7 0 0 5
+ 12420 9180 7650 9180 7650 8190 12420 8190 12420 9180
+2 4 0 1 0 0 50 -1 20 0.000 0 0 7 0 0 5
+ 12510 6615 7650 6615 7650 5670 12510 5670 12510 6615
+2 4 0 1 0 7 50 -1 18 0.000 0 0 7 0 0 5
+ 12420 6525 7560 6525 7560 5580 12420 5580 12420 6525
+3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 2
+ 2 1 1.00 60.00 120.00
+ 8280 1440 7020 2790
+ 0.000 0.000
+3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 2
+ 2 1 1.00 60.00 120.00
+ 5760 2430 7020 2745
+ 0.000 0.000
+3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 2
+ 2 1 1.00 60.00 120.00
+ 7020 3600 7020 4275
+ 0.000 0.000
+3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 2
+ 2 1 1.00 60.00 120.00
+ 7020 5490 7020 6705
+ 0.000 0.000
+3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 2
+ 2 1 1.00 60.00 120.00
+ 7020 8100 7020 9630
+ 0.000 0.000
+4 0 0 50 -1 2 14 0.0000 4 180 2430 7740 8460 Covers all possible changes\001
+4 0 0 50 -1 2 14 0.0000 4 180 2940 7695 5850 Faster because already prepared\001
+4 0 0 50 -1 3 14 0.0000 4 180 3075 7695 6120 Cannot handle description changes\001
+4 0 0 50 -1 3 14 0.0000 4 195 3735 7695 6390 requires free space to store prepared extend\001
+4 0 0 50 -1 3 14 0.0000 4 180 4170 7740 9000 Slower because pysical extend must be recreated\001
+4 0 0 50 -1 2 14 0.0000 4 180 4230 7650 3915 Physical extend for example /tmp/myOSImage\001
+4 0 0 50 -1 2 14 0.0000 4 180 4560 7740 8730 Doesn't require fixed storage for prepared extends\001
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/doc/pictures/maintain.eps new/kiwi/doc/pictures/maintain.eps
--- old/kiwi/doc/pictures/maintain.eps 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/doc/pictures/maintain.eps 2007-05-07 11:40:25.000000000 +0200
@@ -0,0 +1,407 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: maintain.fig
+%%Creator: fig2dev Version 3.2 Patchlevel 4
+%%CreationDate: Thu May 3 11:39:23 2007
+%%For: ms@D7 (Marcus Schaefer)
+%%BoundingBox: 0 0 651 657
+%%Magnification: 1.0000
+%%EndComments
+/$F2psDict 200 dict def
+$F2psDict begin
+$F2psDict /mtrx matrix put
+/col-1 {0 setgray} bind def
+/col0 {0.000 0.000 0.000 srgb} bind def
+/col1 {0.000 0.000 1.000 srgb} bind def
+/col2 {0.000 1.000 0.000 srgb} bind def
+/col3 {0.000 1.000 1.000 srgb} bind def
+/col4 {1.000 0.000 0.000 srgb} bind def
+/col5 {1.000 0.000 1.000 srgb} bind def
+/col6 {1.000 1.000 0.000 srgb} bind def
+/col7 {1.000 1.000 1.000 srgb} bind def
+/col8 {0.000 0.000 0.560 srgb} bind def
+/col9 {0.000 0.000 0.690 srgb} bind def
+/col10 {0.000 0.000 0.820 srgb} bind def
+/col11 {0.530 0.810 1.000 srgb} bind def
+/col12 {0.000 0.560 0.000 srgb} bind def
+/col13 {0.000 0.690 0.000 srgb} bind def
+/col14 {0.000 0.820 0.000 srgb} bind def
+/col15 {0.000 0.560 0.560 srgb} bind def
+/col16 {0.000 0.690 0.690 srgb} bind def
+/col17 {0.000 0.820 0.820 srgb} bind def
+/col18 {0.560 0.000 0.000 srgb} bind def
+/col19 {0.690 0.000 0.000 srgb} bind def
+/col20 {0.820 0.000 0.000 srgb} bind def
+/col21 {0.560 0.000 0.560 srgb} bind def
+/col22 {0.690 0.000 0.690 srgb} bind def
+/col23 {0.820 0.000 0.820 srgb} bind def
+/col24 {0.500 0.190 0.000 srgb} bind def
+/col25 {0.630 0.250 0.000 srgb} bind def
+/col26 {0.750 0.380 0.000 srgb} bind def
+/col27 {1.000 0.500 0.500 srgb} bind def
+/col28 {1.000 0.630 0.630 srgb} bind def
+/col29 {1.000 0.750 0.750 srgb} bind def
+/col30 {1.000 0.880 0.880 srgb} bind def
+/col31 {1.000 0.840 0.000 srgb} bind def
+
+end
+save
+newpath 0 657 moveto 0 0 lineto 651 0 lineto 651 657 lineto closepath clip newpath
+-138.1 658.4 translate
+1 -1 scale
+
+/cp {closepath} bind def
+/ef {eofill} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth} bind def
+/tr {translate} bind def
+/tnt {dup dup currentrgbcolor
+ 4 -2 roll dup 1 exch sub 3 -1 roll mul add
+ 4 -2 roll dup 1 exch sub 3 -1 roll mul add
+ 4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
+ bind def
+/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
+ 4 -2 roll mul srgb} bind def
+/reencdict 12 dict def /ReEncode { reencdict begin
+/newcodesandnames exch def /newfontname exch def /basefontname exch def
+/basefontdict basefontname findfont def /newfont basefontdict maxlength dict def
+basefontdict { exch dup /FID ne { dup /Encoding eq
+{ exch dup length array copy newfont 3 1 roll put }
+{ exch newfont 3 1 roll put } ifelse } { pop pop } ifelse } forall
+newfont /FontName newfontname put newcodesandnames aload pop
+128 1 255 { newfont /Encoding get exch /.notdef put } for
+newcodesandnames length 2 idiv { newfont /Encoding get 3 1 roll put } repeat
+newfontname newfont definefont pop end } def
+/isovec [
+8#055 /minus 8#200 /grave 8#201 /acute 8#202 /circumflex 8#203 /tilde
+8#204 /macron 8#205 /breve 8#206 /dotaccent 8#207 /dieresis
+8#210 /ring 8#211 /cedilla 8#212 /hungarumlaut 8#213 /ogonek 8#214 /caron
+8#220 /dotlessi 8#230 /oe 8#231 /OE
+8#240 /space 8#241 /exclamdown 8#242 /cent 8#243 /sterling
+8#244 /currency 8#245 /yen 8#246 /brokenbar 8#247 /section 8#250 /dieresis
+8#251 /copyright 8#252 /ordfeminine 8#253 /guillemotleft 8#254 /logicalnot
+8#255 /hyphen 8#256 /registered 8#257 /macron 8#260 /degree 8#261 /plusminus
+8#262 /twosuperior 8#263 /threesuperior 8#264 /acute 8#265 /mu 8#266 /paragraph
+8#267 /periodcentered 8#270 /cedilla 8#271 /onesuperior 8#272 /ordmasculine
+8#273 /guillemotright 8#274 /onequarter 8#275 /onehalf
+8#276 /threequarters 8#277 /questiondown 8#300 /Agrave 8#301 /Aacute
+8#302 /Acircumflex 8#303 /Atilde 8#304 /Adieresis 8#305 /Aring
+8#306 /AE 8#307 /Ccedilla 8#310 /Egrave 8#311 /Eacute
+8#312 /Ecircumflex 8#313 /Edieresis 8#314 /Igrave 8#315 /Iacute
+8#316 /Icircumflex 8#317 /Idieresis 8#320 /Eth 8#321 /Ntilde 8#322 /Ograve
+8#323 /Oacute 8#324 /Ocircumflex 8#325 /Otilde 8#326 /Odieresis 8#327 /multiply
+8#330 /Oslash 8#331 /Ugrave 8#332 /Uacute 8#333 /Ucircumflex
+8#334 /Udieresis 8#335 /Yacute 8#336 /Thorn 8#337 /germandbls 8#340 /agrave
+8#341 /aacute 8#342 /acircumflex 8#343 /atilde 8#344 /adieresis 8#345 /aring
+8#346 /ae 8#347 /ccedilla 8#350 /egrave 8#351 /eacute
+8#352 /ecircumflex 8#353 /edieresis 8#354 /igrave 8#355 /iacute
+8#356 /icircumflex 8#357 /idieresis 8#360 /eth 8#361 /ntilde 8#362 /ograve
+8#363 /oacute 8#364 /ocircumflex 8#365 /otilde 8#366 /odieresis 8#367 /divide
+8#370 /oslash 8#371 /ugrave 8#372 /uacute 8#373 /ucircumflex
+8#374 /udieresis 8#375 /yacute 8#376 /thorn 8#377 /ydieresis] def
+/Times-Bold /Times-Bold-iso isovec ReEncode
+/Times-BoldItalic /Times-BoldItalic-iso isovec ReEncode
+/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
+/$F2psEnd {$F2psEnteredState restore end} def
+
+$F2psBegin
+10 setmiterlimit
+0 slj 0 slc
+ 0.06299 0.06299 sc
+%
+% Fig objects follow
+%
+%
+% here starts figure with depth 50
+% Polyline
+2 slj
+7.500 slw
+n 6975 720 m 6992 696 l 7013 671 l 7038 646 l 7064 623 l 7092 600 l
+ 7120 579 l 7148 560 l 7175 542 l 7201 526 l 7227 511 l
+ 7251 498 l 7275 485 l 7298 474 l 7320 463 l 7343 453 l
+ 7365 443 l 7388 432 l 7411 422 l 7436 412 l 7462 400 l
+ 7489 388 l 7519 375 l 7551 361 l 7586 345 l 7624 328 l
+ 7665 310 l 7709 290 l 7756 269 l 7806 247 l 7858 224 l
+ 7911 202 l 7965 180 l 8030 155 l 8090 133 l 8145 114 l
+ 8194 99 l 8236 85 l 8271 75 l 8300 66 l 8324 60 l
+ 8343 55 l 8358 51 l 8370 48 l 8380 46 l 8389 45 l
+ 8397 44 l 8406 43 l 8417 42 l 8429 42 l 8444 41 l
+ 8462 40 l 8484 39 l 8510 38 l 8540 38 l 8573 38 l
+ 8610 39 l 8648 41 l 8685 45 l 8734 55 l 8773 68 l
+ 8802 82 l 8821 98 l 8831 113 l 8833 129 l 8829 143 l
+ 8822 158 l 8812 173 l 8803 187 l 8795 202 l 8791 217 l
+ 8791 233 l 8798 250 l 8813 267 l 8837 285 l 8870 301 l
+ 8910 315 l 8946 324 l 8981 330 l 9016 333 l 9047 334 l
+ 9075 333 l 9100 329 l 9121 324 l 9140 318 l 9157 312 l
+ 9173 304 l 9188 296 l 9202 288 l 9217 281 l 9234 274 l
+ 9252 268 l 9273 262 l 9297 258 l 9324 256 l 9354 256 l
+ 9385 258 l 9418 263 l 9450 270 l 9488 283 l 9517 298 l
+ 9535 313 l 9543 327 l 9542 340 l 9535 353 l 9523 364 l
+ 9510 375 l 9497 386 l 9486 398 l 9479 411 l 9480 425 l
+ 9489 441 l 9509 459 l 9542 477 l 9585 495 l 9618 506 l
+ 9653 514 l 9688 520 l 9723 524 l 9756 526 l 9787 525 l
+ 9816 522 l 9844 518 l 9870 512 l 9894 506 l 9918 499 l
+ 9941 491 l 9964 484 l 9987 477 l 10011 472 l 10034 467 l
+ 10059 465 l 10084 465 l 10109 468 l 10134 474 l 10159 485 l
+ 10181 499 l 10201 517 l 10215 540 l 10223 564 l 10225 589 l
+ 10224 615 l 10220 640 l 10214 664 l 10206 687 l 10198 709 l
+ 10188 729 l 10178 748 l 10168 765 l 10158 782 l 10147 798 l
+ 10136 814 l 10125 829 l 10112 845 l 10099 862 l 10085 879 l
+ 10069 898 l 10051 918 l 10031 939 l 10008 961 l 9983 985 l
+ 9955 1009 l 9924 1034 l 9891 1058 l 9855 1080 l 9815 1101 l
+ 9776 1117 l 9739 1128 l 9704 1136 l 9673 1139 l 9646 1139 l
+ 9622 1135 l 9601 1130 l 9582 1122 l 9566 1112 l 9551 1102 l
+ 9536 1091 l 9522 1080 l 9507 1070 l 9492 1060 l 9474 1052 l
+ 9455 1045 l 9434 1040 l 9410 1039 l 9384 1040 l 9356 1044 l
+ 9327 1053 l 9298 1065 l 9270 1080 l 9244 1100 l 9224 1121 l
+ 9212 1144 l 9206 1165 l 9208 1186 l 9216 1206 l 9229 1225 l
+ 9246 1242 l 9266 1259 l 9288 1274 l 9311 1290 l 9334 1305 l
+ 9354 1321 l 9372 1337 l 9385 1354 l 9392 1372 l 9391 1391 l
+ 9382 1411 l 9361 1431 l 9328 1450 l 9283 1469 l 9225 1485 l
+ 9184 1493 l 9141 1500 l 9097 1505 l 9052 1509 l 9007 1511 l
+ 8964 1513 l 8922 1514 l 8882 1514 l 8845 1513 l 8809 1512 l
+ 8775 1510 l 8743 1508 l 8712 1505 l 8683 1502 l 8656 1499 l
+ 8629 1496 l 8602 1492 l 8576 1489 l 8550 1485 l 8524 1481 l
+ 8496 1477 l 8468 1473 l 8438 1469 l 8407 1464 l 8374 1460 l
+ 8338 1455 l 8300 1450 l 8260 1445 l 8217 1440 l 8172 1434 l
+ 8125 1429 l 8076 1423 l 8025 1416 l 7974 1409 l 7924 1402 l
+ 7875 1395 l 7812 1384 l 7757 1374 l 7709 1364 l 7670 1355 l
+ 7637 1347 l 7612 1340 l 7593 1334 l 7579 1328 l 7570 1324 l
+ 7564 1321 l 7561 1318 l 7560 1315 l 7560 1312 l 7561 1310 l
+ 7562 1307 l 7563 1304 l 7563 1300 l 7562 1295 l 7560 1290 l
+ 7555 1283 l 7550 1275 l 7543 1265 l 7535 1254 l 7527 1242 l
+ 7520 1229 l 7515 1215 l 7514 1195 l 7519 1177 l 7530 1162 l
+ 7544 1149 l 7561 1139 l 7580 1131 l 7600 1126 l 7621 1121 l
+ 7643 1117 l 7664 1114 l 7685 1110 l 7706 1104 l 7726 1098 l
+ 7744 1089 l 7760 1078 l 7773 1065 l 7782 1050 l 7785 1035 l
+ 7781 1019 l 7773 1006 l 7763 997 l 7752 992 l 7743 989 l
+ 7734 989 l 7726 991 l 7718 994 l 7708 996 l 7697 998 l
+ 7683 998 l 7663 995 l 7637 988 l 7604 978 l 7563 963 l
+ 7515 945 l 7483 933 l 7451 920 l 7418 909 l 7386 899 l
+ 7355 890 l 7325 883 l 7296 878 l 7268 874 l 7240 872 l
+ 7214 871 l 7189 870 l 7164 870 l 7140 870 l 7116 870 l
+ 7093 869 l 7071 867 l 7049 864 l 7029 860 l 7010 853 l
+ 6992 843 l 6977 831 l 6966 815 l 6959 796 l 6957 774 l
+ 6962 748 l
+ cp gs col0 s gr
+/Times-Bold-iso ff 300.00 scf sf
+7425 810 m
+gs 1 -1 sc (Software package) col0 sh gr
+/Times-Bold-iso ff 300.00 scf sf
+8055 1170 m
+gs 1 -1 sc (Source) col0 sh gr
+% Polyline
+0 slj
+n 2445 855 m 2340 855 2340 2370 105 arcto 4 {pop} repeat
+ 2340 2475 6555 2475 105 arcto 4 {pop} repeat
+ 6660 2475 6660 960 105 arcto 4 {pop} repeat
+ 6660 855 2445 855 105 arcto 4 {pop} repeat
+ cp gs 0.00 setgray ef gr gs col0 s gr
+% Polyline
+n 2310 720 m 2205 720 2205 2235 105 arcto 4 {pop} repeat
+ 2205 2340 6420 2340 105 arcto 4 {pop} repeat
+ 6525 2340 6525 825 105 arcto 4 {pop} repeat
+ 6525 720 2310 720 105 arcto 4 {pop} repeat
+ cp gs col7 0.90 shd ef gr gs col0 s gr
+/Times-Bold-iso ff 270.00 scf sf
+2385 1440 m
+gs 1 -1 sc (versioning system like SVN to) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+2385 2070 m
+gs 1 -1 sc (OS-Images in product branches) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+2385 1755 m
+gs 1 -1 sc (track down changes and organize) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+2385 1080 m
+gs 1 -1 sc (Image Description as part of a) col0 sh gr
+% Polyline
+n 5640 9765 m 5535 9765 5535 10335 105 arcto 4 {pop} repeat
+ 5535 10440 8535 10440 105 arcto 4 {pop} repeat
+ 8640 10440 8640 9870 105 arcto 4 {pop} repeat
+ 8640 9765 5640 9765 105 arcto 4 {pop} repeat
+ cp gs 0.00 setgray ef gr gs col0 s gr
+% Polyline
+n 5505 9630 m 5400 9630 5400 10200 105 arcto 4 {pop} repeat
+ 5400 10305 8400 10305 105 arcto 4 {pop} repeat
+ 8505 10305 8505 9735 105 arcto 4 {pop} repeat
+ 8505 9630 5505 9630 105 arcto 4 {pop} repeat
+ cp gs col7 0.90 shd ef gr gs col0 s gr
+/Times-Bold-iso ff 375.00 scf sf
+5670 10080 m
+gs 1 -1 sc (kiwi --create ...) col0 sh gr
+% Polyline
+n 5640 2925 m 5535 2925 5535 3495 105 arcto 4 {pop} repeat
+ 5535 3600 8535 3600 105 arcto 4 {pop} repeat
+ 8640 3600 8640 3030 105 arcto 4 {pop} repeat
+ 8640 2925 5640 2925 105 arcto 4 {pop} repeat
+ cp gs 0.00 setgray ef gr gs col0 s gr
+% Polyline
+n 5505 2790 m 5400 2790 5400 3360 105 arcto 4 {pop} repeat
+ 5400 3465 8400 3465 105 arcto 4 {pop} repeat
+ 8505 3465 8505 2895 105 arcto 4 {pop} repeat
+ 8505 2790 5505 2790 105 arcto 4 {pop} repeat
+ cp gs col7 0.90 shd ef gr gs col0 s gr
+/Times-Bold-iso ff 375.00 scf sf
+5670 3240 m
+gs 1 -1 sc (kiwi --prepare ...) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+4410 7020 m
+gs 1 -1 sc (Scenario B\)) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+4410 7650 m
+gs 1 -1 sc (Image Description changes) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+4410 7965 m
+gs 1 -1 sc (kiwi --prepare ...) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+4410 7335 m
+gs 1 -1 sc (Software package Source changes and/or) col0 sh gr
+% Polyline
+n 4290 6705 m 4185 6705 4185 7995 105 arcto 4 {pop} repeat
+ 4185 8100 9795 8100 105 arcto 4 {pop} repeat
+ 9900 8100 9900 6810 105 arcto 4 {pop} repeat
+ 9900 6705 4290 6705 105 arcto 4 {pop} repeat
+ cp gs col0 s gr
+% Polyline
+n 4290 4275 m 4185 4275 4185 5385 105 arcto 4 {pop} repeat
+ 4185 5490 9795 5490 105 arcto 4 {pop} repeat
+ 9900 5490 9900 4380 105 arcto 4 {pop} repeat
+ 9900 4275 4290 4275 105 arcto 4 {pop} repeat
+ cp gs col0 s gr
+/Times-Bold-iso ff 270.00 scf sf
+4365 4590 m
+gs 1 -1 sc (Scenario A\)) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+4365 4905 m
+gs 1 -1 sc (Software package Source changes) col0 sh gr
+/Times-Bold-iso ff 270.00 scf sf
+4365 5220 m
+gs 1 -1 sc (kiwi --upgrade --add-repo ... --add-repotype) col0 sh gr
+% Polyline
+n 7845 8325 m 7740 8325 7740 9210 105 arcto 4 {pop} repeat
+ 7740 9315 12405 9315 105 arcto 4 {pop} repeat
+ 12510 9315 12510 8430 105 arcto 4 {pop} repeat
+ 12510 8325 7845 8325 105 arcto 4 {pop} repeat
+ cp gs 0.00 setgray ef gr gs col0 s gr
+% Polyline
+n 7755 8190 m 7650 8190 7650 9075 105 arcto 4 {pop} repeat
+ 7650 9180 12315 9180 105 arcto 4 {pop} repeat
+ 12420 9180 12420 8295 105 arcto 4 {pop} repeat
+ 12420 8190 7755 8190 105 arcto 4 {pop} repeat
+ cp gs col7 0.90 shd ef gr gs col0 s gr
+% Polyline
+n 7755 5670 m 7650 5670 7650 6510 105 arcto 4 {pop} repeat
+ 7650 6615 12405 6615 105 arcto 4 {pop} repeat
+ 12510 6615 12510 5775 105 arcto 4 {pop} repeat
+ 12510 5670 7755 5670 105 arcto 4 {pop} repeat
+ cp gs 0.00 setgray ef gr gs col0 s gr
+% Polyline
+n 7665 5580 m 7560 5580 7560 6420 105 arcto 4 {pop} repeat
+ 7560 6525 12315 6525 105 arcto 4 {pop} repeat
+ 12420 6525 12420 5685 105 arcto 4 {pop} repeat
+ 12420 5580 7665 5580 105 arcto 4 {pop} repeat
+ cp gs col7 0.90 shd ef gr gs col0 s gr
+% Polyline
+2 slj
+gs clippath
+6987 2780 m 7031 2821 l 7158 2685 l 7034 2775 l 7114 2644 l cp
+eoclip
+n 8280 1440 m
+ 7020 2790 l gs col0 s gr gr
+
+% arrowhead
+0 slj
+n 7114 2644 m 7034 2775 l 7158 2685 l 7115 2687 l 7114 2644 l
+ cp gs 0.00 setgray ef gr col0 s
+% Polyline
+2 slj
+gs clippath
+7027 2777 m 7041 2719 l 6862 2674 l 7001 2740 l 6848 2732 l cp
+eoclip
+n 5760 2430 m
+ 7020 2745 l gs col0 s gr gr
+
+% arrowhead
+0 slj
+n 6848 2732 m 7001 2740 l 6862 2674 l 6884 2710 l 6848 2732 l
+ cp gs 0.00 setgray ef gr col0 s
+% Polyline
+2 slj
+gs clippath
+6990 4290 m 7050 4290 l 7050 4105 l 7020 4255 l 6990 4105 l cp
+eoclip
+n 7020 3600 m
+ 7020 4275 l gs col0 s gr gr
+
+% arrowhead
+0 slj
+n 6990 4105 m 7020 4255 l 7050 4105 l 7020 4135 l 6990 4105 l
+ cp gs 0.00 setgray ef gr col0 s
+% Polyline
+2 slj
+gs clippath
+6990 6720 m 7050 6720 l 7050 6535 l 7020 6685 l 6990 6535 l cp
+eoclip
+n 7020 5490 m
+ 7020 6705 l gs col0 s gr gr
+
+% arrowhead
+0 slj
+n 6990 6535 m 7020 6685 l 7050 6535 l 7020 6565 l 6990 6535 l
+ cp gs 0.00 setgray ef gr col0 s
+% Polyline
+2 slj
+gs clippath
+6990 9645 m 7050 9645 l 7050 9460 l 7020 9610 l 6990 9460 l cp
+eoclip
+n 7020 8100 m
+ 7020 9630 l gs col0 s gr gr
+
+% arrowhead
+0 slj
+n 6990 9460 m 7020 9610 l 7050 9460 l 7020 9490 l 6990 9460 l
+ cp gs 0.00 setgray ef gr col0 s
+/Times-Bold-iso ff 210.00 scf sf
+7740 8460 m
+gs 1 -1 sc (Covers all possible changes) col0 sh gr
+/Times-Bold-iso ff 210.00 scf sf
+7695 5850 m
+gs 1 -1 sc (Faster because already prepared) col0 sh gr
+/Times-BoldItalic-iso ff 210.00 scf sf
+7695 6120 m
+gs 1 -1 sc (Cannot handle description changes) col0 sh gr
+/Times-BoldItalic-iso ff 210.00 scf sf
+7695 6390 m
+gs 1 -1 sc (requires free space to store prepared extend) col0 sh gr
+/Times-BoldItalic-iso ff 210.00 scf sf
+7740 9000 m
+gs 1 -1 sc (Slower because pysical extend must be recreated) col0 sh gr
+/Times-Bold-iso ff 210.00 scf sf
+7650 3915 m
+gs 1 -1 sc (Physical extend for example /tmp/myOSImage) col0 sh gr
+/Times-Bold-iso ff 210.00 scf sf
+7740 8730 m
+gs 1 -1 sc (Doesn't require fixed storage for prepared extends) col0 sh gr
+% here ends figure;
+$F2psEnd
+rs
+showpage
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/doc/Revision.txt new/kiwi/doc/Revision.txt
--- old/kiwi/doc/Revision.txt 2007-04-25 12:34:52.000000000 +0200
+++ new/kiwi/doc/Revision.txt 2007-05-07 11:40:25.000000000 +0200
@@ -1 +1 @@
-3.3
+3.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2007-04-27 15:22:28.000000000 +0200
+++ new/kiwi/kiwi.pl 2007-05-07 11:40:25.000000000 +0200
@@ -61,6 +61,8 @@
our $CreatePassword; # create crypt password string
our $ImageName; # filename of current image, used in Modules
our %ForeignRepo; # may contain XML::LibXML::Element objects
+our $AddRepository; # add repository for building physical extend
+our $AddRepositoryType; # add repository type
#============================================
# Globals
@@ -146,6 +148,12 @@
}
$kiwi -> done();
#==========================================
+ # Check for add-repo option
+ #------------------------------------------
+ if (defined $AddRepository) {
+ $xml -> addRepository ($AddRepositoryType,$AddRepository);
+ }
+ #==========================================
# Check for inheritance
#------------------------------------------
if (! $xml -> setupImageInheritance()) {
@@ -273,6 +281,12 @@
}
$kiwi -> done();
#==========================================
+ # Check for add-repo option
+ #------------------------------------------
+ if (defined $AddRepository) {
+ $xml -> addRepository ($AddRepositoryType,$AddRepository);
+ }
+ #==========================================
# Initialize root system, use existing root
#------------------------------------------
$root = new KIWIRoot (
@@ -433,7 +447,9 @@
"prepare|p=s" => \$Prepare,
"list|l" => \&listImage,
"create|c=s" => \$Create,
- "create-instsource|C=s" => \$CreateInstSource,
+ "create-instsource=s" => \$CreateInstSource,
+ "add-repo=s" => \$AddRepository,
+ "add-repotype=s" => \$AddRepositoryType,
"upgrade|u=s" => \$Upgrade,
"destdir|d=s" => \$Destination,
"root|r=s" => \$RootTree,
@@ -475,6 +491,11 @@
$kiwi -> failed ();
my $code = kiwiExit (1); return $code;
}
+ if ((defined $AddRepository) && (! defined $AddRepositoryType)) {
+ $kiwi -> info ("No repository type specified");
+ $kiwi -> failed ();
+ my $code = kiwiExit (1); return $code;
+ }
#==========================================
# remove pre-defined smart channels
#------------------------------------------
@@ -506,7 +527,7 @@
print " kiwi --installcd <initrd> --installcd-system <systemImage>\n";
print "Helper Tools:\n";
print " kiwi --createpassword\n";
- print " kiwi -C | --create-instsource <image-path>\n";
+ print " kiwi --create-instsource <image-path>\n";
print "Options:\n";
print "--\n";
print " [ -d | --destdir <destination-path> ]\n";
@@ -523,6 +544,10 @@
print " Strip shared objects and executables\n";
print " makes only sense in combination with --create\n";
print "\n";
+ print " [ --add-repo <repo-path> --add-repotype <type> ]\n";
+ print " Add the given repository and type for this run of an\n";
+ print " image prepare or upgrade process.\n";
+ print "\n";
print " [ --logfile <filename> | terminal ]\n";
print " Write to the log file \`<filename>' instead of\n";
print " the terminal.\n";
@@ -546,11 +571,16 @@
if (-l "$System/$image") {
next;
}
- if (open (HD,"$System/$image/VERSION")) {
- my $version = <HD>;
- my $line = sprintf ("%-20s -> Version: %s",$image,$version);
- $kiwi -> info ("Image: $line");
- close HD;
+ if (-f "$System/$image/config.xml") {
+ $kiwi -> info ("$image");
+ my $xml = new KIWIXML ( $kiwi,"$System/$image" );
+ if (! $xml) {
+ $kiwi -> failed();
+ next;
+ }
+ my $version = $xml -> getImageVersion();
+ $kiwi -> note (" -> Version: $version");
+ $kiwi -> done();
}
}
exit 0;
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 2007-04-25 10:50:25.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2007-05-03 13:46:07.000000000 +0200
@@ -1157,6 +1157,13 @@
print FD "COMBINED_IMAGE=yes\n";
}
#==========================================
+ # UNIONFS_CONFIG information
+ #------------------------------------------
+ my %unionConfig = $xml -> getDeployUnionConfig ();
+ if (defined %unionConfig) {
+ print FD "UNIONFS_CONFIG=$unionConfig{rw},$unionConfig{ro},$unionConfig{type}\n";
+ }
+ #==========================================
# More to come...
#------------------------------------------
close FD;
@@ -1576,7 +1583,7 @@
$tree = $imageTree;
}
unlink ("$imageDest/$name");
- my $data = qx (/usr/bin/mksquashfs $tree $imageDest/$name -noI 2>&1);
+ my $data = qx (/usr/bin/mksquashfs $tree $imageDest/$name 2>&1);
my $code = $? >> 8;
if ($code != 0) {
$kiwi -> failed ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm
--- old/kiwi/modules/KIWIManager.pm 2007-04-27 15:22:28.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2007-05-07 11:40:25.000000000 +0200
@@ -161,7 +161,7 @@
$logs = 0;
}
#==========================================
- # run upgrade process in screen
+ # run process in screen session
#------------------------------------------
my $data = qx ( chmod 755 $screenCall );
my $fd = new FileHandle;
@@ -534,7 +534,7 @@
# Create screen call file
#------------------------------------------
$kiwi -> info ("Upgrading image...");
- print $fd "chroot $root yes | zypper upgrade -y\n";
+ print $fd "chroot $root yes | zypper upgrade\n";
print $fd "echo \$? > $screenCall.exit\n";
$fd -> close();
}
@@ -628,8 +628,7 @@
$kiwi -> info ("Initializing image system on: $root...");
my $forceChannels = join (",",@channelList);
my @installOpts = (
- "--catalog $forceChannels",
- "-y"
+ "--catalog $forceChannels"
);
#==========================================
# Add package manager to package list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIPattern.pm new/kiwi/modules/KIWIPattern.pm
--- old/kiwi/modules/KIWIPattern.pm 2007-03-30 13:38:49.000000000 +0200
+++ new/kiwi/modules/KIWIPattern.pm 2007-05-07 11:40:25.000000000 +0200
@@ -134,14 +134,17 @@
}
if ($url =~ /^\//) {
my $path = "$url//suse/setup/descr";
- my $file = bsd_glob ("$path/$pattern-*.$arch.pat");
- if (! defined $file) {
- $file = bsd_glob ("$path/$pattern-*.pat");
- }
- if (! open (FD,$file)) {
- return undef;
+ my @file = bsd_glob ("$path/$pattern-*.$arch.pat");
+ foreach my $file (@file) {
+ # / FIXME /
+ # The glob match will include the -32bit patterns in any
+ # case. Is that ok or not ? should it be configurable ?
+ # ---
+ if (! open (FD,$file)) {
+ return undef;
+ }
+ local $/; $content .= <FD>; close FD;
}
- local $/; $content = <FD>; close FD;
} else {
my $urlHandler = new KIWIURL ($kiwi);
my $publics_url = $url;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm
--- old/kiwi/modules/KIWIRoot.pm 2007-04-27 11:35:55.000000000 +0200
+++ new/kiwi/modules/KIWIRoot.pm 2007-05-07 11:40:25.000000000 +0200
@@ -584,43 +584,19 @@
push (@mountList,"$root/sys");
push (@mountList,"$root/dev/pts");
}
- while (<FD>) {
- if ($_ =~ /^#/) {
+ foreach my $chl (keys %{$sourceChannel{private}}) {
+ my @opts = @{$sourceChannel{private}{$chl}};
+ my $path = $opts[2];
+ if ($path =~ /=$baseSystem\/(.*)$/) {
+ $path = $1;
+ } else {
next;
}
- if ($_ =~ /(^\/.*)/) {
- my @list = split (/ +/,$1);
- my $device = shift @list;
- my $mount = shift @list;
- $mount = $prefix.$mount;
- push (@mountList,$mount);
- if ($device =~ /loop/) {
- #$kiwi -> info ("Mounting local loop: $device $mount\n");
- my $loop = qx (/sbin/losetup $device); chomp ($loop);
- if ($loop =~ /\((.*)\)/) {
- my $lobase = $1;
- my $mtab = "/etc/mtab";
- my $lofile = qx (cat $mtab | grep $lobase | cut -f1 -d' ');
- chomp $lofile;
- qx (mount -o loop $lofile $mount 2>&1);
- }
- } else {
- #$kiwi -> info ("Mounting local device: $device $mount\n");
- qx (mkdir -p $mount);
- qx (mount $device $mount 2>&1);
- }
- }
- if ($_ =~ /(.*:\/.*) (.*) nfs/) {
- my $device = $1;
- my $mount = $2;
- $mount = $prefix.$mount;
- push (@mountList,$mount);
- #$kiwi -> info ("Mounting NFS device: $device $mount\n");
- qx (mkdir -p $mount);
- qx (mount $device $mount 2>&1);
- }
+ my $mount= $prefix.$path;
+ push (@mountList,$mount);
+ qx (mkdir -p $mount);
+ qx (mount -o bind $path $mount 2>&1);
}
- close FD;
$kiwi -> done();
return $this;
}
@@ -635,10 +611,10 @@
my $this = shift;
my $prefix = $root."/".$baseSystem;
foreach my $item (reverse @mountList) {
- #$kiwi -> info ("Umounting device: $item\n");
+ $kiwi -> info ("Umounting path: $item\n");
qx (umount $item 2>/dev/null);
if ($item =~ /^$prefix/) {
- rmdir $item;
+ qx ( rmdir -p $item 2>&1 );
}
}
return $this;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIScheme.xsd new/kiwi/modules/KIWIScheme.xsd
--- old/kiwi/modules/KIWIScheme.xsd 2007-04-27 15:22:28.000000000 +0200
+++ new/kiwi/modules/KIWIScheme.xsd 2007-05-07 11:40:25.000000000 +0200
@@ -24,6 +24,7 @@
<xs:element ref="packages" minOccurs="1" maxOccurs="3"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="inherit" type="xs:string"/>
</xs:complexType>
</xs:element>
@@ -78,6 +79,7 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="partitions" minOccurs="0" maxOccurs="1"/>
+ <xs:element ref="union" minOccurs="0" maxOccurs="1"/>
<xs:element ref="configuration" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="server" type="xs:string"/>
@@ -85,6 +87,14 @@
</xs:complexType>
</xs:element>
+ <xs:element name="union">
+ <xs:complexType>
+ <xs:attribute name="ro" type="xs:string"/>
+ <xs:attribute name="rw" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="partitions">
<xs:complexType>
<xs:sequence>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm
--- old/kiwi/modules/KIWIXML.pm 2007-04-27 15:22:28.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2007-05-07 11:40:25.000000000 +0200
@@ -39,6 +39,7 @@
my $partitionsNodeList;
my $configfileNodeList;
my $schemeNodeList;
+my $unionNodeList;
my $schemeVers;
my @urllist;
my $arch;
@@ -111,6 +112,7 @@
-> getElementsByTagName ("partitions");
$configfileNodeList = $systemTree
-> getElementsByTagName("configuration");
+ $unionNodeList = $systemTree -> getElementsByTagName ("union");
};
if ($@) {
$kiwi -> failed ();
@@ -252,6 +254,27 @@
}
#==========================================
+# getDeployUnionConfig
+#------------------------------------------
+sub getDeployUnionConfig {
+ # ...
+ # Get the union file system configuration, if any
+ # ---
+ my $this = shift;
+ my $node = $unionNodeList -> get_node(1);
+ if (!defined $node) {
+ return undef;
+ }
+
+ my %config = ();
+ $config{ro} = $node -> getAttribute ("ro");
+ $config{rw} = $node -> getAttribute ("rw");
+ $config{type} = $node -> getAttribute ("type");
+
+ return %config;
+}
+
+#==========================================
# getDeployImageDevice
#------------------------------------------
sub getDeployImageDevice {
@@ -519,6 +542,28 @@
}
#==========================================
+# addRepository
+#------------------------------------------
+sub addRepository {
+ my $this = shift;
+ my $type = shift;
+ my $path = shift;
+ my $tempXML = new XML::LibXML;
+ my $xaddXML = new XML::LibXML::NodeList;
+ my $tempFile = $imageDesc."/config.xml";
+ my $tempTree = $tempXML -> parse_file ( $tempFile );
+ my $temprepositNodeList = $tempTree -> getElementsByTagName ("repository");
+ my $element = $temprepositNodeList -> get_node(1);
+ $element -> setAttribute ("type",$type);
+ $element -> setAttribute ("status","fixed");
+ $element -> getElementsByTagName ("source") -> get_node (1)
+ -> setAttribute ("path",$path);
+ $xaddXML -> push ( $element );
+ $repositNodeList -> append ( $xaddXML );
+ return $xaddXML;
+}
+
+#==========================================
# getImageConfig
#------------------------------------------
sub getImageConfig {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |