Author: jsuchome Date: Wed Oct 10 13:00:07 2007 New Revision: 41310 URL: http://svn.opensuse.org/viewcvs/yast?rev=41310&view=rev Log: - add a default user to the iso template (#328145) - new template based on current kiwi-desc-livesystem (#328003) - do not allow configuration without name (#328003) - 2.16.0 Removed: trunk/product-creator/src/data/kiwi_templates/iso/root/etc/group trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/boot trunk/product-creator/src/data/kiwi_templates/iso/root/etc/inittab trunk/product-creator/src/data/kiwi_templates/iso/root/etc/passwd trunk/product-creator/src/data/kiwi_templates/iso/root/etc/shadow trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/console trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/keyboard trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/config trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/dhcp trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/ifcfg-lo trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/ifroute-lo trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/routes trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/windowmanager trunk/product-creator/src/data/kiwi_templates/xen/root/etc/passwd trunk/product-creator/src/data/kiwi_templates/xen/root/etc/shadow trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/dhcp trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/ifcfg-lo trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/ifroute-lo Modified: trunk/product-creator/VERSION trunk/product-creator/agent-kiwi/ag_kiwi trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/data/kiwi_templates/iso/config.sh trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am trunk/product-creator/src/data/kiwi_templates/xen/config.xml trunk/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Oct 10 13:00:07 2007 @@ -1 +1 @@ -2.15.8 +2.16.0 Modified: trunk/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/agent-kiwi/ag_kiwi?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/agent-kiwi/ag_kiwi (original) +++ trunk/product-creator/agent-kiwi/ag_kiwi Wed Oct 10 13:00:07 2007 @@ -36,7 +36,7 @@ for (my $i=1;$i<= $packageNodeList->size();$i++) { my $node = $packageNodeList -> get_node($i); my $type = $node -> getAttribute ("type"); - y2milestone ("package list type: $type"); + y2debug ("package list type: $type"); $retmap{$key}{$type} = {}; my $patterntype = $node -> getAttribute ("patternType"); $retmap{$key}{$type}{"patternType"} = $patterntype if $patterntype; @@ -60,9 +60,10 @@ } my $prefs = $optionsNodeList -> get_node(1); foreach my $tag ("packagemanager", "version", "rpm-check-signatures", - "rpm-force", "size", "defaultdestination") { + "rpm-force", "size", "defaultdestination", "defaultroot", "locale") + { my $element = $prefs -> getElementsByTagName ($tag); - $retmap{$tag} = $element-> get_node(1)->textContent () if ($element); + $retmap{$tag} = $element->get_node(1)->textContent () if ($element); } # now get the 'type' attributes # example: <type primary="true" boot="isoboot/suse-10.3" flags="compressed">iso</type> @@ -96,11 +97,17 @@ my $image = $systemTree -> getElementsByTagName ("image")->get_node (1); my $image_name = $image -> getAttribute ("name"); - $retmap{"name"} = $image_name if $image_name; + if ($image_name) { + $retmap{"name"} = $image_name; + y2milestone ("image name: $image_name"); + } my $scheme_ver = $image -> getAttribute ("schemeversion"); $retmap{"schemeversion"} = $scheme_ver if $scheme_ver; + my $inherit = $image -> getAttribute ("inherit"); + $retmap{"inherit"} = $inherit if $inherit; + $retmap{"users"} = {}; foreach my $usernode ($usrdataNodeList -> get_nodelist()) { my $group = $usernode -> getAttribute("group"); @@ -123,7 +130,7 @@ for (my $i=1;$i<= $driversNodeList->size();$i++) { my $node = $driversNodeList -> get_node($i); my $type = $node -> getAttribute ("type"); - y2milestone ("driver list type: $type"); + y2debug ("driver list type: $type"); $retmap{$key}{$type} = {}; foreach my $tag ("file") { my @list = (); Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Oct 10 13:00:07 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 4 09:50:06 CEST 2007 - jsuchome@suse.cz + +- add a default user to the iso template (#328145) +- new template based on current kiwi-desc-livesystem (#328003) +- do not allow configuration without name (#328003) +- 2.16.0 + +------------------------------------------------------------------- Thu Sep 27 16:03:04 CEST 2007 - lslezak@suse.cz - fixed a typo in the description of "passphrase_file" option Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Oct 10 13:00:07 2007 @@ -69,7 +69,7 @@ /** * generate the 'repository' tag */ - map get_source_value (string source) { + map get_source_value (string source, map config) { string type = "yast2"; string source_path = adapt_source_path (source); @@ -86,7 +86,7 @@ type = "rpm-md"; } }); - return $[ + map ret = $[ "__key" : "repository", "type" : type, "__children": [ @@ -96,6 +96,7 @@ ] ] ]; + return ret; // FIXME add status? } /** @@ -118,10 +119,11 @@ "__value" : task, "primary" : "true", "boot" : boot_image, -//FIXME (KiwiConfig["compressed"]:false ? ",compressed" : ""), ]; if (task != "iso") - ret["filesystem"] = "ext3"; + ret["filesystem"] = config["type",task,"filesystem"]:"ext3"; + if (config["type",task,"flags"]:"" != "") + ret["flags"] = config["type",task,"flags"]:""; return ret; } @@ -400,7 +402,7 @@ } write_list[0,"__children"] = union (write_list[0,"__children"]:[], maplist (string source, (list<string>) KiwiConfig["sources"]:[], - ``(get_source_value (source)) + ``(get_source_value (source, KiwiConfig)) ) ); write_list[0,"__children"] = union (write_list[0,"__children"]:[], [ @@ -451,6 +453,10 @@ SCR::Execute (.target.bash, "chmod +x " + config_dir + "/" + file); } }); + foreach (string file, KiwiConfig["import_files"]:[], { + y2milestone ("copying %1 to %2", file,config_dir); + SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", file,config_dir)); + }); return true; } @@ -494,10 +500,13 @@ void update_output () { // read the output line from irw: list<string> out = (list<string>)SCR::Read(.background.newout); + /* foreach (string line, out, { line = String::Replace (line, "\r", "\n"); UI::ChangeWidget (`id(`log), `LastLine, line + "\n"); }); + */ + UI::ChangeWidget (`id(`log), `LastLine, mergestring (out, "\n") + "\n"); list<string> err = (list<string>) SCR::Read(.background.newerr); foreach (string line, err, { @@ -514,17 +523,26 @@ symbol ret = nil; boolean creating = false; + boolean first_lines = false; + integer lines_show = 0; + integer times_read = 0; do { ret = (symbol) UI::PollInput(); if ((boolean) SCR::Read(.background.output_open) && - (integer) SCR::Read(.background.newlines)>0) + (integer) SCR::Read(.background.newlines) > lines_show) { + if (times_read > 10) + lines_show = 50; + else + times_read = times_read + 1; update_output (); } else if (!(boolean)SCR::Read(.background.isrunning)) { update_output (); + lines_show = 0; + times_read = 0; integer status = (integer) SCR::Read (.background.status); if (status != 0) Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/config.sh?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.sh (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.sh Wed Oct 10 13:00:07 2007 @@ -22,6 +22,18 @@ test -f /.profile && . /.profile #====================================== +# Sound? +#-------------------------------------- + +# Load sound drivers by default +perl -ni -e 'm,^blacklist snd-, || print;' \ + /etc/modprobe.d/blacklist + +# and unmute their mixers. +perl -pi -e 's,/sbin/alsactl -F restore,/bin/set_default_volume -f,;' \ + /etc/udev/rules.d/40-alsa.rules + +#====================================== # Greeting... #-------------------------------------- echo "Configure image: [$name]..." @@ -30,10 +42,71 @@ # Activate services #-------------------------------------- suseActivateServices + +#====================================== +# Deactivate services +#-------------------------------------- suseRemoveService boot.multipath suseRemoveService boot.device-mapper suseRemoveService mdadmd suseRemoveService multipathd +suseRemoveService rpmconfigcheck +suseRemoveService waitfornm +suseRemoveService smb +suseRemoveService xfs +suseRemoveService nmb +suseRemoveService autofs +suseRemoveService rpasswdd +suseRemoveService boot.scsidev +suseRemoveService boot.md +suseInsertService create_xconf +suseService boot.rootfsck off +# these two we want to disable for policy reasons +chkconfig sshd off +chkconfig cron off + +# these are disabled because kiwi enables them without being default +chkconfig aaeventd off +chkconfig autoyast off +chkconfig boot.sched off +chkconfig create_xconf off +chkconfig dvb off +chkconfig esound off +chkconfig fam off +chkconfig festival off +chkconfig hotkey-setup off +chkconfig ipxmount off +chkconfig irda off +chkconfig java.binfmt_misc off +chkconfig joystick off +chkconfig lirc off +chkconfig lm_sensors off +chkconfig nfs off +chkconfig ntp off +chkconfig openct off +chkconfig pcscd off +chkconfig powerd off +chkconfig raw off +chkconfig saslauthd off +chkconfig spamd off +chkconfig xinetd off +chkconfig ypbind off + +cd / +patch -p0 < /tmp/config.patch +rm /tmp/config.patch + +insserv + +rpm -e smart +rpm -e rpm-python +rpm -e python + +: > /var/log/zypper.log +rm -rf /var/cache/zypp/raw/* + +zypper addrepo http://download.opensuse.org/distribution/10.3/repo/oss/ 10.3 +zypper addrepo http://download.opensuse.org/update/10.3/ 10.3-update #====================================== # SuSEconfig Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/config.xml?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Wed Oct 10 13:00:07 2007 @@ -10,41 +10,17 @@ <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>True</rpm-force> </preferences> + <users group="users"> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> + </users> <packages type="image" patternType="plusRecommended"> <package name="xkeyboard-config"/> + <package name="sax2"/> <opensusePattern name="default"/> <opensusePattern name="base"/> <opensusePattern name="x11"/> - <ignore name="smtp_daemon"/> - <ignore name="pfscalibratio"/> - <ignore name="jaf-demo"/> - <ignore name="jaf-javadoc"/> - <ignore name="jaf-manual"/> - <ignore name="jai"/> - <ignore name="java-1_4_2-sun"/> - <ignore name="java-1_4_2-sun-alsa"/> - <ignore name="java-1_4_2-sun-devel"/> - <ignore name="java-1_4_2-sun-jdbc"/> - <ignore name="java-1_4_2-sun-plugin"/> - <ignore name="javamail-manual"/> - <ignore name="jmx-javadoc"/> - <ignore name="jta-javadoc"/> - <ignore name="mcelog"/> - <ignore name="numactl"/> - <ignore name="wesnoth-data-small"/> - <ignore name="sendmail"/> - <ignore name="exim"/> - <ignore name="AdobeICCProfiles"/> - <ignore name="RealPlayer"/> - <ignore name="agfa-fonts"/> - <ignore name="flash-player"/> - <ignore name="java-1_5_0-sun"/> - <ignore name="java-1_5_0-sun-plugin"/> - <ignore name="java-1_5_0-sun-jdbc"/> - <ignore name="java-1_5_0-sun-devel"/> - <ignore name="java-1_5_0-sun-alsa"/> - <ignore name="opensuse-quickstart_en"/> - <ignore name="util-linux-crypto"/> + <opensusePattern name="kde"/> </packages> <packages type="xen" memory="512" disk="/dev/sda"> <package name="kernel-xen"/> Modified: trunk/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/root/etc/Makefile.am Wed Oct 10 13:00:07 2007 @@ -5,11 +5,4 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc -ydata_DATA = \ - group \ - passwd \ - shadow \ - inittab - - -EXTRA_DIST = $(ydata_DATA) +#EXTRA_DIST = $(ydata_DATA) Modified: trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/root/etc/init.d/Makefile.am Wed Oct 10 13:00:07 2007 @@ -4,6 +4,6 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc/init.d ydata_SCRIPTS = \ - boot + create_xconf EXTRA_DIST = $(ydata_SCRIPTS) Modified: trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/Makefile.am Wed Oct 10 13:00:07 2007 @@ -6,9 +6,6 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc/sysconfig ydata_DATA = \ - console \ - displaymanager \ - keyboard \ - windowmanager + displaymanager EXTRA_DIST = $(ydata_DATA) Modified: trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/root/etc/sysconfig/network/Makefile.am Wed Oct 10 13:00:07 2007 @@ -5,12 +5,7 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/iso/root/etc/sysconfig/network ydata_DATA = \ - config \ - dhcp \ - ifcfg-eth0 \ - ifcfg-lo \ - ifroute-lo \ - routes + ifcfg-eth0 EXTRA_DIST = $(ydata_DATA) Modified: trunk/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/xen/config.xml?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/xen/config.xml Wed Oct 10 13:00:07 2007 @@ -10,6 +10,10 @@ <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>True</rpm-force> </preferences> + <users group="users"> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> + </users> <packages type="image"> <package name="OpenIPMI"/> <package name="lvm2"/> Modified: trunk/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am (original) +++ trunk/product-creator/src/data/kiwi_templates/xen/root/etc/Makefile.am Wed Oct 10 13:00:07 2007 @@ -5,8 +5,4 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/xen/root/etc -ydata_DATA = \ - passwd \ - shadow - EXTRA_DIST = $(ydata_DATA) Modified: trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am (original) +++ trunk/product-creator/src/data/kiwi_templates/xen/root/etc/sysconfig/network/Makefile.am Wed Oct 10 13:00:07 2007 @@ -5,9 +5,6 @@ ydatadir = @ydatadir@/product-creator/kiwi_templates/xen/root/etc/sysconfig/network ydata_DATA = \ - dhcp \ - ifcfg-eth0 \ - ifcfg-lo \ - ifroute-lo + ifcfg-eth0 EXTRA_DIST = $(ydata_DATA) Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=41310&r1=41309&r2=41310&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Oct 10 13:00:07 2007 @@ -759,6 +759,19 @@ KiwiConfig[file] = contents; } }); + // take care of the rest in the input directory (#330052) + list import_files = []; + map out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 -d %1/* 2>/dev/null", kiwi_configuration)); + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + if (line == "") return; + string last = substring (line, findlastof (line, "/") + 1); + if (contains (["images.sh", "config.sh", "config.xml", "root","config"], + last)) + return; + import_files = add (import_files, line); + }); + KiwiConfig["import_files"] = import_files; map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) @@ -1411,6 +1424,8 @@ kiwi_configuration = dir; Config = eval (Kiwi::ReadConfigXML (kiwi_configuration)); name = Config["name"]:""; + if (Config["iso-directory"]:"" != "") + UI::ChangeWidget (`id (`out_dir),`Value,Config["iso-directory"]:""); repositories = $[]; foreach (map repo, (list<map>) Config["repository"]:[], { string source = repo["source",0,"path"]:""; @@ -1618,6 +1633,14 @@ } else if (ret == `next) { + name = (string) UI::QueryWidget (`id (`config), `Value); + if (name == "") + { + // error popup + Report::Error(_("Enter the name of the configuration.")); + UI::SetFocus (`id (`config)); + continue; + } out_dir = (string) UI::QueryWidget (`id (`out_dir), `Value); if (out_dir == "") { @@ -1637,6 +1660,7 @@ } if (ret == `next) { + Config["name"] = name; Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; Config["iso-directory"] = out_dir; @@ -1650,8 +1674,6 @@ Pkg::SourceRestore (); Pkg::SourceLoad(); } - if (Config["name"]:"" == "") - Config["name"] = UI::QueryWidget (`id (`config), `Value); ProductCreator::Config = Config; ProductCreator::kiwi_task = kiwi_task; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org