YaST Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2011
- 25 participants
- 461 discussions
[yast-commit] r66587 - in /trunk/mail: agents/Makefile.am package/yast2-mail.changes src/Mail.ycp src/mail-server_dialogs.ycp src/mail.ycp src/ui.ycp src/widgets.ycp yast2-mail.spec.in
by varkoly@svn2.opensuse.org 26 Oct '11
by varkoly@svn2.opensuse.org 26 Oct '11
26 Oct '11
Author: varkoly
Date: Wed Oct 26 09:33:40 2011
New Revision: 66587
URL: http://svn.opensuse.org/viewcvs/yast?rev=66587&view=rev
Log: (empty)
Modified:
trunk/mail/agents/Makefile.am
trunk/mail/package/yast2-mail.changes
trunk/mail/src/Mail.ycp
trunk/mail/src/mail-server_dialogs.ycp
trunk/mail/src/mail.ycp
trunk/mail/src/ui.ycp
trunk/mail/src/widgets.ycp
trunk/mail/yast2-mail.spec.in
Modified: trunk/mail/agents/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/Makefile.am?rev=6658…
==============================================================================
--- trunk/mail/agents/Makefile.am (original)
+++ trunk/mail/agents/Makefile.am Wed Oct 26 09:33:40 2011
@@ -7,7 +7,7 @@
agent_SCRIPTS = ag_fetchmailrc \
ag_smtp_auth \
ag_mailtable \
- \
+ setup_dkim_verifying.pl \
ag_mailconfig \
ag_postfix_mastercf \
MasterCFParser.pm \
Modified: trunk/mail/package/yast2-mail.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?…
==============================================================================
--- trunk/mail/package/yast2-mail.changes (original)
+++ trunk/mail/package/yast2-mail.changes Wed Oct 26 09:33:40 2011
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Oct 26 07:33:05 UTC 2011 - varkoly(a)suse.com
+
+- bnc#723742 - SLES11_SP2_LOC : The 'No Outgoing Mail' radio button can't check in Mail server global settings panel!
+
+-------------------------------------------------------------------
Thu Sep 29 12:47:58 CEST 2011 - visnov(a)suse.cz
- set dialog title
Modified: trunk/mail/src/Mail.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=66587&r1=6…
==============================================================================
--- trunk/mail/src/Mail.ycp (original)
+++ trunk/mail/src/Mail.ycp Wed Oct 26 09:33:40 2011
@@ -79,14 +79,16 @@
/**
* Use a virus scanner (AMaViS).
* amavisd-new (mta-independent) must be installed.
- * It will be installed if amavis_allowed and it is not installed.
+ * It will be installed if is not installed.
*/
global boolean use_amavis = false;
/**
- * Is amavis available on the installation media?
+ * Use a DKIM for outgoing email.
+ * If it is enabled AMaViS will be enabled too.
*/
- global boolean amavis_allowed = true;
+ global boolean use_dkim = false;
+
/**
* Domains for locally delivered mail.
@@ -169,6 +171,12 @@
*/
boolean enable_smtp_auth = false;
+ /**
+ * Sysconfig setting which contains the email address which will
+ * be applied as sender for system mails
+ */
+ global string system_mail_sender = "";
+
/* ---------------------------------------------------------------- */
// constants
@@ -440,11 +448,8 @@
}
// amavis
- string amavis_pkg = "amavisd-new";
- amavis_allowed = PackageSystem::Installed (amavis_pkg) ||
- Mode::commandline ();
- // || PackageSystem::Available (amavis_pkg);
- use_amavis = amavis_allowed && (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes");
+ use_amavis = (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes");
+ use_dkim = use_amavis && (SCR::Read (.sysconfig.amavis.USE_DKIM) == "yes");
// local_domains
string ld_s = "";
@@ -668,8 +673,8 @@
create_config = true;
listen_remote = true;
connection_type = `dialup;
- amavis_allowed = true;
use_amavis = true;
+ use_dkim = true;
// good example?
local_domains = ["branch1.example.com", "branch2.example.com"];
outgoing_mail_server = "mail.example.com";
@@ -1096,7 +1101,7 @@
else if (mta == `postfix)
{
ret = (integer)
- SCR::Execute(.target.bash, "/sbin/SuSEconfig --module postfix");
+ SCR::Execute(.target.bash, "/usr/sbin/SuSEconfig.postfix");
}
else
{
@@ -1129,6 +1134,10 @@
return false;
}
}
+ if (use_dkim)
+ {
+ SCR::Execute(.target.bash, "/usr/lib/YaST2/servers_non_y2/setup_dkim_verifying.pl");
+ }
}
Service::Stop ("fetchmail");
@@ -1287,22 +1296,26 @@
});
mta = settings["mta"]: `other;
- connection_type = settings["connection_type"]: `none;
- listen_remote = settings["listen_remote"]: false;
- use_amavis = settings["use_amavis"]: false;
- local_domains = settings["local_domains"]: [];
+ connection_type = settings["connection_type"]: `none;
+ listen_remote = settings["listen_remote"]: false;
+ use_amavis = settings["use_amavis"]: false;
+ use_dkim = settings["use_dkim"]: false;
+ local_domains = settings["local_domains"]: [];
outgoing_mail_server = settings["outgoing_mail_server"]: "";
- postfix_mda = settings["postfix_mda"]: `local;
- from_header = settings["from_header"]: "";
+ postfix_mda = settings["postfix_mda"]: `local;
+ from_header = settings["from_header"]: "";
masquerade_other_domains = settings["masquerade_other_domains"]: [];
- masquerade_users = settings["masquerade_users"]: [];
- fetchmail = settings["fetchmail"]: [];
+ masquerade_users = settings["masquerade_users"]: [];
+ fetchmail = settings["fetchmail"]: [];
MailAliases::aliases = settings["aliases"]: [];
MailAliases::FilterRootAlias ();
-// MailAliases::merge_aliases = settings["merge_aliases"]: false;
- virtual_users = settings["virtual_users"]: [];
- smtp_use_TLS = settings["smtp_use_TLS"]: "yes";
- smtp_auth = settings["smtp_auth"]: [];
+ virtual_users = settings["virtual_users"]: [];
+ smtp_use_TLS = settings["smtp_use_TLS"]: "yes";
+ smtp_auth = settings["smtp_auth"]: [];
+ system_mail_sender = settings["system_mail_sender"]:"";
+ if( use_dkim ) {
+ use_amavis = true;
+ }
y2debug ("after %1", settings); // may contain passwords
return true;
}
@@ -1319,6 +1332,7 @@
"connection_type": connection_type,
"listen_remote": listen_remote,
"use_amavis": use_amavis,
+ "use_dkim" : use_dkim,
"local_domains": local_domains,
"outgoing_mail_server": outgoing_mail_server,
"from_header": from_header,
@@ -1330,6 +1344,7 @@
"virtual_users": virtual_users,
"smtp_auth": smtp_auth,
"smtp_use_TLS": smtp_use_TLS,
+ "system_mail_sender":system_mail_sender,
];
if (mta == `postfix)
{
@@ -1434,18 +1449,13 @@
summary = summary + ListItem (_("Masquerade Users"), masquerade_users, "user");
// summary header
summary = Summary::AddHeader(summary, _("Accept remote SMTP connections"));
- summary = Summary::AddLine(summary, (listen_remote) ?
- // summary item
- _("Yes") :
- // summary item
- _("No"));
+ summary = Summary::AddLine(summary, (listen_remote) ? _("Yes") : _("No"));
// summary header
summary = Summary::AddHeader(summary, _("Use AMaViS"));
- summary = Summary::AddLine(summary, (use_amavis) ?
- // summary item
- _("Yes") :
- // summary item
- _("No"));
+ summary = Summary::AddLine(summary, (use_amavis) ? _("Yes") : _("No"));
+ // summary header
+ summary = Summary::AddHeader(summary, _("Use DKIM"));
+ summary = Summary::AddLine(summary, (use_dkim) ? _("Yes") : _("No"));
// summary item
summary = summary + ListItem (_("Fetchmail"), fetchmail, "server");
// summary item
Modified: trunk/mail/src/mail-server_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp…
==============================================================================
--- trunk/mail/src/mail-server_dialogs.ycp (original)
+++ trunk/mail/src/mail-server_dialogs.ycp Wed Oct 26 09:33:40 2011
@@ -40,7 +40,6 @@
boolean ldap_server_local = false;
string comment = "";
Ldap::Read();
- Ldap::LDAPInit();
map<string, any> LDAPSettings = (map <string, any>) Ldap::Export();
list args = [];
integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem");
@@ -140,6 +139,11 @@
//write the settings:
Ldap::Write(abort_block);
}
+ else
+ {
+ Ldap::LDAPInit();
+ }
+
MailServer::AdminPassword = Ldap::LDAPAskAndBind(false);
if( MailServer::AdminPassword != nil )
{
@@ -1373,7 +1377,7 @@
{
SMT = "NONE";
}
- MailServer::GlobalSettings["SendingMail","Type"] = UI::QueryWidget(`id(`SendingMailType), `CurrentButton);
+ MailServer::GlobalSettings["SendingMail","Type"] = SMT;
MailServer::GlobalSettings["SendingMail","TLS"] = UI::QueryWidget(`id(`SendingMailTLS), `CurrentButton);
MailServer::GlobalSettings["SendingMail","RelayHost","Name"] = "";
MailServer::GlobalSettings["SendingMail","RelayHost","Auth"] = "0";
Modified: trunk/mail/src/mail.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=66587&r1=6…
==============================================================================
--- trunk/mail/src/mail.ycp (original)
+++ trunk/mail/src/mail.ycp Wed Oct 26 09:33:40 2011
@@ -18,6 +18,16 @@
*
*/
+/**
+ * @param flag "<b>permanent</b>", "<b>dialup</b>", or "<b>screenshots</b>"<br>
+ * <dl>
+ * <dt>permanent<dd>preselects permanent connnection
+ * <dt>dialup<dd>preselects dial-up connnection
+ * <dt>screenshots
+ * <dd>uses faked data (see Mail::Fake), enables running the module
+ * as non-root. (Uses Mode::screen_shot().)
+ * </dl>
+ */
{
/***
* <h3>Configuration of the mail</h3>
Modified: trunk/mail/src/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/ui.ycp?rev=66587&r1=665…
==============================================================================
--- trunk/mail/src/ui.ycp (original)
+++ trunk/mail/src/ui.ycp Wed Oct 26 09:33:40 2011
@@ -230,7 +230,8 @@
list widgets = [];
- symbol ct = Mail::connection_type;
+ symbol ct = Mail::connection_type;
+ boolean ama = Mail::use_amavis;
if (preselect_connection_type != nil)
{
ct = preselect_connection_type;
@@ -248,33 +249,26 @@
// Translators: radio button label
`RadioButton (`id (`permanent), `opt (`notify), _("&Permanent"), ct == `permanent),
// Translators: radio button label
- `RadioButton (`id (`dialup), `opt (`notify), _("&Dial-up"), ct == `dialup),
+ `RadioButton (`id (`dialup), `opt (`notify), _("&Dial-up"), ct == `dialup),
// Translators: radio button label
- `RadioButton (`id (`none), `opt (`notify), _("No &connection"), ct == `none),
- // Translators: radio button label
- `RadioButton (`id (`nodaemon), `opt (`notify), _("Do not start Postfix as Daemon"), ct == `nodaemon),
+ `RadioButton (`id (`none), `opt (`notify), _("No &connection"), ct == `none),
+ // Translators: radio button label
+ `RadioButton (`id (`nodaemon), `opt (`notify), _("Do not start Postfix as Daemon"), ct == `nodaemon),
]
)
);
- boolean amavis_allowed = Mail::amavis_allowed;
-
- term amavis_t = nil;
- if (amavis_allowed)
- {
- amavis_t = `Left (WJ_MakeWidget (`use_amavis));
- widgets = add (widgets, `use_amavis);
- }
- else
- {
- amavis_t = `Empty (`id (`use_amavis));
- }
+ term amavis_t = `Left (WJ_MakeWidget (`use_amavis));
+ widgets = add (widgets, `use_amavis);
+ term dkim_t = `Left (WJ_MakeWidget (`use_dkim));
+ widgets = add (widgets, `use_dkim);
contents = `HSquash (
`VBox (
contents,
`VSpacing (1),
- amavis_t
+ amavis_t,
+ dkim_t
)
);
@@ -286,25 +280,38 @@
any ret = nil;
while (true)
{
- ct = (symbol) UI::QueryWidget (`id (`ctg), `CurrentButton);
+ ct = (symbol) UI::QueryWidget (`id (`ctg), `CurrentButton);
if (ct == `permanent || ct == `dialup)
{
UI::ChangeWidget (`id (`use_amavis), `Enabled, true);
+ UI::ChangeWidget (`id (`use_dkim), `Enabled, true);
Wizard::RestoreNextButton();
- //argh, slow
- //Wizard::RestoreNextButton ();
- }
- else if (ct == `nodaemon)
- {
- UI::ChangeWidget (`id (`use_amavis), `Value, false);
- UI::ChangeWidget (`id (`use_amavis), `Enabled, false);
}
+ else if (ct == `nodaemon)
+ {
+ UI::ChangeWidget (`id (`use_amavis), `Value, false);
+ UI::ChangeWidget (`id (`use_amavis), `Enabled, false);
+ UI::ChangeWidget (`id (`use_dkim), `Value, false);
+ UI::ChangeWidget (`id (`use_dkim), `Enabled, false);
+ }
else if (ct == `none)
{
UI::ChangeWidget (`id (`use_amavis), `Value, false);
UI::ChangeWidget (`id (`use_amavis), `Enabled, false);
+ UI::ChangeWidget (`id (`use_dkim), `Value, false);
+ UI::ChangeWidget (`id (`use_dkim), `Enabled, false);
Wizard::SetNextButton(`next, Label::FinishButton() );
}
+ ama = (boolean) UI::QueryWidget (`id (`use_amavis), `Value);
+ if(ama)
+ {
+ UI::ChangeWidget (`id (`use_dkim), `Enabled, true);
+ }
+ else
+ {
+ UI::ChangeWidget (`id (`use_dkim), `Value, false);
+ UI::ChangeWidget (`id (`use_dkim), `Enabled, false);
+ }
ret = UI::UserInput ();
if (ret == `cancel)
Modified: trunk/mail/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/widgets.ycp?rev=66587&r…
==============================================================================
--- trunk/mail/src/widgets.ycp (original)
+++ trunk/mail/src/widgets.ycp Wed Oct 26 09:33:40 2011
@@ -356,6 +356,23 @@
Mail::use_amavis = am;
}
+/**
+ * @return a variable to be used by a widget
+ */
+define boolean Get_use_dkim () ``{
+ return Mail::use_dkim;
+}
+
+/**
+ * Set a variable acording to widget value
+ * @param id widget id
+ */
+define void Set_use_dkim (symbol id) ``{
+ boolean dkim = (boolean) UI::QueryWidget (`id (id), `Value);
+ Mail::Touch (Mail::use_dkim != dkim);
+ Mail::use_dkim = dkim;
+}
+
/**
* @return a variable to be used by a widget
@@ -715,12 +732,19 @@
"widget": `CheckBox (),
// checkbox label
"label": _("&Enable virus scanning (AMaViS)"),
+ // we need notify option to enable disable dkim
+ "opt" : `opt (`notify),
// help text
"help": _("
-<p>Enabling virus scanning checks incoming and outgoing mail
+<p><b>Enabling virus scanning (AMaViS)</b> checks incoming and outgoing mail
with AMaViS.</p>
")
// help text
++ _("<p>Enabling AMaViS will also enable the following modules: </p>
+<p><b>Spamassassin</b> SPAM scanner</p>
+<p><b>DKIM</b> checks Domain Key signed incomming mails</p>
+<p><b>Clamav</b> open source virus scanner engine</p>")
+ // help text
+ _("
<p>If AMaViS is not installed and you want to use it, it will be installed
automatically.</p>
@@ -728,6 +752,38 @@
"get": Get_use_amavis,
"set": Set_use_amavis,
],
+ `use_dkim: $[
+ "widget": `CheckBox (),
+ // checkbox label
+ "label": _("&Enable DKIM signing for outgoing mails."),
+ // help text
+ "help": _("
+<p><b>Enabling DKIM signig for outgoing mails.</b></p>
+")
+ // help text
++ _("
+<p>Enabling DKIM for outgoing emails requires additional actions. A SSL key
+will be generated for the 'mydomain'-value defined in postfix. A new service
+'submission' will be configured in postfix. After this is set up you can send
+email with this service 'submission' from 'mynetworks' with enabled SASL
+authentication. Only the emails sent by this new service will be signed with
+the domain key.</p>
+") +
+ // help text
+ _("
+<p>The public key of the domain key needs to be offered by a Domain Name
+Service. The public key will be saved as a DNS TXT record
+into <b>/var/db/dkim/[mydomain].public.txt</b> and needs to be deployed to an
+according Domain Name Service. If there is a name service
+running on this server, which is the authoritative server for that domain the
+public key will be added as a TXT record to that domain zone
+automatically.</p>
+") +
+ // help text
+ _("Enabling DKIM support the virus scanning (AMaViS) will be enabled too."),
+ "get": Get_use_dkim,
+ "set": Set_use_dkim,
+ ],
`fm_server: $[
"widget": `TextEntry (),
// Translators: text entry label
Modified: trunk/mail/yast2-mail.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=6658…
==============================================================================
--- trunk/mail/yast2-mail.spec.in (original)
+++ trunk/mail/yast2-mail.spec.in Wed Oct 26 09:33:40 2011
@@ -99,6 +99,7 @@
@agentdir@/ag_smtp_auth
@agentdir@/CyrusConfParser.pm
@agentdir@/MasterCFParser.pm
+%attr(0755,root,root) @agentdir@/setup_dkim_verifying.pl
%dir /etc/openldap/
%dir /etc/openldap/schema/
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66586 - /trunk/storage/storage/src/modules/Storage.ycp
by fehr@svn2.opensuse.org 25 Oct '11
by fehr@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: fehr
Date: Wed Oct 26 00:27:50 2011
New Revision: 66586
URL: http://svn.opensuse.org/viewcvs/yast?rev=66586&view=rev
Log:
handle nfs case in GetUsedDisk
Modified:
trunk/storage/storage/src/modules/Storage.ycp
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor…
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 26 00:27:50 2011
@@ -6120,6 +6120,10 @@
if( !contains( ret, info["cdevice"]:"" ))
ret = add( ret, info["cdevice"]:"" );
}
+ else if( info["ctype"]:`CT_UNKNOWN==`CT_NFS )
+ {
+ ret = add( ret, "/dev/nfs" );
+ }
else if( info["ctype"]:`CT_UNKNOWN==`CT_BTRFS )
{
map bt = find( map p, tg["/dev/btrfs","partitions"]:[],
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66585 - /tags/branch-Code-11-SP2-2_17_118/storage/
by fehr@svn2.opensuse.org 25 Oct '11
by fehr@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: fehr
Date: Wed Oct 26 00:19:12 2011
New Revision: 66585
URL: http://svn.opensuse.org/viewcvs/yast?rev=66585&view=rev
Log:
Created tag branch-Code-11-SP2-2_17_118 for storage
Added:
tags/branch-Code-11-SP2-2_17_118/storage/ (props changed)
- copied from r66584, branches/SuSE-Code-11-SP2-Branch/storage/
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66584 - /tags/branch-Code-11-SP2-2_17_118/storage/
by fehr@svn2.opensuse.org 25 Oct '11
by fehr@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: fehr
Date: Wed Oct 26 00:19:06 2011
New Revision: 66584
URL: http://svn.opensuse.org/viewcvs/yast?rev=66584&view=rev
Log:
update
Removed:
tags/branch-Code-11-SP2-2_17_118/storage/
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66583 - /branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp
by fehr@svn2.opensuse.org 25 Oct '11
by fehr@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: fehr
Date: Wed Oct 26 00:18:30 2011
New Revision: 66583
URL: http://svn.opensuse.org/viewcvs/yast?rev=66583&view=rev
Log:
fix handling nfs case in GetUsedDisks
Modified:
branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp
Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora…
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original)
+++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Wed Oct 26 00:18:30 2011
@@ -6122,6 +6122,10 @@
if( !contains( ret, info["cdevice"]:"" ))
ret = add( ret, info["cdevice"]:"" );
}
+ else if( info["ctype"]:`CT_UNKNOWN==`CT_NFS )
+ {
+ ret = add( ret, "/dev/nfs" );
+ }
else if( info["ctype"]:`CT_UNKNOWN==`CT_BTRFS )
{
map bt = find( map p, tg["/dev/btrfs","partitions"]:[],
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66582 - in /branches/tmp/ke/autoinstallation/doc: Makefile.am xml/Makefile.am
by keichwa@svn2.opensuse.org 25 Oct '11
by keichwa@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: keichwa
Date: Tue Oct 25 17:23:25 2011
New Revision: 66582
URL: http://svn.opensuse.org/viewcvs/yast?rev=66582&view=rev
Log:
novdoc adjustments
Modified:
branches/tmp/ke/autoinstallation/doc/Makefile.am
branches/tmp/ke/autoinstallation/doc/xml/Makefile.am
Modified: branches/tmp/ke/autoinstallation/doc/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/M…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/Makefile.am (original)
+++ branches/tmp/ke/autoinstallation/doc/Makefile.am Tue Oct 25 17:23:25 2011
@@ -8,3 +8,14 @@
htmldir = $(docdir)/html
+pdf: xml/ay_bigfile.xml
+ daps -e ENV-autoyast pdf-color
+
+html: xml/ay_bigfile.xml
+ daps -e ENV-autoyast html
+
+html-debug: xml/ay_bigfile.xml
+ daps --debug -e ENV-autoyast html
+
+xml/ay_bigfile.xml:
+ cd xml; make ay_bigfile.xml
Modified: branches/tmp/ke/autoinstallation/doc/xml/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/Makefile.am (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/Makefile.am Tue Oct 25 17:23:25 2011
@@ -16,7 +16,8 @@
CLEANFILES = .html.sum profile.dtd.xml elements \
elements.xml elements.ent profile.dtd.xml examples.ent\
components.ent .ps.sum autoyast.out autoyast.pdf autoyast.fo \
- images.ent
+ images.ent \
+ ay_bigfile_docbook.xml ay_bigfile_novdoc.xml ay_bigfile.xml
STYLESHEET_CSS = default.css
@@ -59,13 +60,29 @@
cp images/PNG/*png ../images/src/png
ay_bigfile_docbook.xml: prep-daps-images
+# Remove internal entity statements
ay_bigfile_docbook.xml: autoyast.xml
{ head -n 3 $< ; \
XML_CATALOG_FILES=@XML_CATALOG@ \
xmllint --xinclude --noent --nocdata -o - $< \
| awk 'BEGIN{b=0}; /^]>/ && b == 0 {b=1}; b == 1 {print}' \
- | sed 's|fileref=\"img/|fileref=\"|' ; } > $@
+ | sed -e 's|fileref=\"img/|fileref=\"|' \
+ -e 's|<acronym>|<phrase role=\"acronym\">|g' \
+ -e 's|</acronym>|</phrase>|g' \
+ -e 's|<caution>|<!-- role=\"caution\" --><note>|g' \
+ -e 's|</caution>|</note>|g' \
+ -e 's|title id=[^>]*|title|' \
+ -e 's|endterm=[^/]*||' \
+ -e 's|frame=\"top\"||g' \
+ -e "s|frame='top'||g" \
+ -e 's|revision=\"1\"||g' \
+ -e 's|align=\"center\"||' ; } > $@
+
+ay_bigfile.xml: ay_bigfile_docbook.xml
+ xsltproc --output $@ \
+ /usr/share/susedoc/xslt/misc/db2novdoc.xsl $<
+# Not in use; use ay_bigfile.xml
ay_bigfile_novdoc.xml: prep-daps-images
ay_bigfile_novdoc.xml: autoyast.xml
{ echo '<?xml version="1.0" encoding="UTF-8"?>'; \
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66581 - /branches/tmp/ke/autoinstallation/doc/examples/example.sysconfig.xml
by keichwa@svn2.opensuse.org 25 Oct '11
by keichwa@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: keichwa
Date: Tue Oct 25 17:22:58 2011
New Revision: 66581
URL: http://svn.opensuse.org/viewcvs/yast?rev=66581&view=rev
Log:
novdoc adjustments
Modified:
branches/tmp/ke/autoinstallation/doc/examples/example.sysconfig.xml
Modified: branches/tmp/ke/autoinstallation/doc/examples/example.sysconfig.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/e…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/examples/example.sysconfig.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/examples/example.sysconfig.xml Tue Oct 25 17:22:58 2011
@@ -5,7 +5,6 @@
<example>
<title>Sysconfig Configuration</title>
- <para>
<screen>
<![CDATA[
<sysconfig config:type="list" >
@@ -27,7 +26,6 @@
</sysconfig>
]]>
</screen>
- </para>
<para>
Both relative and absolute pathes can be provided. If no absolute path is
given, it is treated as a sysconfig file under the
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66580 - /branches/tmp/ke/autoinstallation/doc/xml/
by keichwa@svn2.opensuse.org 25 Oct '11
by keichwa@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: keichwa
Date: Tue Oct 25 17:22:51 2011
New Revision: 66580
URL: http://svn.opensuse.org/viewcvs/yast?rev=66580&view=rev
Log:
novdoc adjustments
Modified:
branches/tmp/ke/autoinstallation/doc/xml/ASKSection.xml
branches/tmp/ke/autoinstallation/doc/xml/BootloaderSection.xml
branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml
branches/tmp/ke/autoinstallation/doc/xml/Installation.xml
branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml
branches/tmp/ke/autoinstallation/doc/xml/NetworkSection.xml
branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml
branches/tmp/ke/autoinstallation/doc/xml/ScriptsSection.xml
branches/tmp/ke/autoinstallation/doc/xml/SoftwareSection.xml
branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml
Modified: branches/tmp/ke/autoinstallation/doc/xml/ASKSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/ASKSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/ASKSection.xml Tue Oct 25 17:22:51 2011
@@ -35,7 +35,7 @@
<para>
The following elements must be between the <ask-list config:type="list"><ask> ... </ask></ask-list> tags in the <general> section.
</para>
- <para>
+
<table frame='top'>
<title>XML representation</title>
<tgroup cols="3">
@@ -49,95 +49,95 @@
<tbody>
<row>
<entry>question</entry>
- <entry>The question you want to ask the user.
- <para><screen><question>Enter the LDAP server</question></screen></para></entry>
+ <entry><para>The question you want to ask the user.</para>
+ <screen><question>Enter the LDAP server</question></screen></entry>
<entry>The default value is the path to the element (the path often looks strange, so I recommend to enter a question)</entry>
</row>
<row>
<entry>default</entry>
- <entry>you can set a pre-selection for the user. A textentry will be filled out with this value,
+ <entry><para>you can set a pre-selection for the user. A textentry will be filled out with this value,
a checkbox will be "true" or "false" and a selection will have this default "value" pre-selected.
- <para><screen><default>dc=suse,dc=de</default></screen></para></entry>
+ </para><screen><default>dc=suse,dc=de</default></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>help</entry>
- <entry>An optional helptext that is shown on the left side of the question.
- <para><screen><help>Enter the LDAP server address.</help></screen></para></entry>
+ <entry><para>An optional helptext that is shown on the left side of the question.
+ </para><screen><help>Enter the LDAP server address.</help></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>title</entry>
- <entry>An optional title that is shown above the questions.
- <para><screen><title>LDAP server</title></screen></para></entry>
+ <entry><para>An optional title that is shown above the questions.
+ </para><screen><title>LDAP server</title></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>type</entry>
- <entry>the type of the element you want to change. Possible values are "symbol","boolean","string" and "integer".
+ <entry><para>the type of the element you want to change. Possible values are "symbol","boolean","string" and "integer".
The filesystem in
the partition section is a symbol, while the "encrypted" element in the user configuration is a boolean.
You can see the type of that element if you look in your profile at the config:type="...." attribute.
Since openSUSE 11.2 and SLES11-SP2 you can use "static_text" as type too. A static_text is just a text that
does not require any user input and can be used to show information if it's not wanted in the help text.
- <para><screen><type>symbol</type></screen></para></entry>
+ </para><screen><type>symbol</type></screen></entry>
<entry>optional. The defaul is string. If type is "symbol" you must provide the selection element too (see below)</entry>
</row>
<row>
<entry>password</entry>
- <entry>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this
+ <entry><para>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this
to "true" makes only sense if "type" is string.
- <para><screen><password config:type="boolean">true</password></screen></para></entry>
+ </para><screen><password config:type="boolean">true</password></screen></entry>
<entry>optional. The default is "false"</entry>
</row>
<row>
<entry>path (deprecated since openSUSE 11.0 - use pathlist)</entry>
- <entry>The path to the element in the profile. It's a comma seperated list of elements that describes the
+ <entry><para>The path to the element in the profile. It's a comma seperated list of elements that describes the
path to the element you want to change. For example, the ldap server element can be found in the profile
in the <ldap><ldap_server> section. So if you want to change that value, you have to set the
path to "ldap,ldap_server". If you want to change the password of the first user in the profile, you have to
set the path to "users,0,user_password". The "0" indicates the first user in the <users config:type="list">
list of users in the profile.
- <para><screen><path>networking,dns,hostname</path></screen></para></entry>
+ </para><screen><path>networking,dns,hostname</path></screen></entry>
<entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
</row>
<row>
- <entry>pathlist (available since openSUSE 11.0 and replaces <emphasis>path</emphasis>)</entry>
- <entry>a list of <emphasis>path</emphasis> elements (see above)
- <para><screen><pathlist config:type="list"><path>networking,dns,hostname</path><path>...</path></screen></para></entry>
- <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
+ <entry><para>pathlist (available since openSUSE 11.0 and replaces <emphasis>path</emphasis>)</para></entry>
+ <entry><para>a list of <emphasis>path</emphasis> elements (see above)
+ </para><screen><pathlist config:type="list"><path>networking,dns,hostname</path><path>...</path></screen></entry>
+ <entry><para>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></para></entry>
</row>
<row>
<entry>file (available since SLES10 SP1 and SL 10.2)</entry>
- <entry>you can store the answer to a question in a file, to use it in one of your scripts later. If you ask during stage=inital and you want to use the answer in stage2, then you have to copy the answer-file in a chroot script that is running as chrooted=false. Do it like this "cp /tmp/my_answer /mnt/tmp/". The reason for that is, that /tmp in stage1 is just in the RAM disk and will get lost after the reboot but the installed system is already mounted at /mnt/
- <para><screen><file>/tmp/answer_hostname</file></screen></para></entry>
- <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
+ <entry><para>you can store the answer to a question in a file, to use it in one of your scripts later. If you ask during stage=inital and you want to use the answer in stage2, then you have to copy the answer-file in a chroot script that is running as chrooted=false. Do it like this "cp /tmp/my_answer /mnt/tmp/". The reason for that is, that /tmp in stage1 is just in the RAM disk and will get lost after the reboot but the installed system is already mounted at /mnt/
+ </para><screen><file>/tmp/answer_hostname</file></screen></entry>
+ <entry><para>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></para></entry>
</row>
<row>
<entry>password</entry>
- <entry>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this
+ <entry><para>if this boolean is set to "true", a password dialog pops up instead of a simple text entry. Setting this
to "true" makes only sense if "type" is string.
- <para><screen><password config:type="boolean">true</password></screen></para></entry>
+ </para><screen><password config:type="boolean">true</password></screen></entry>
<entry>optional. The default is "false"</entry>
</row>
<row>
<entry>stage</entry>
- <entry>stage configures the installation stage where the question pops up. You can set this value to "cont" or
+ <entry><para>stage configures the installation stage where the question pops up. You can set this value to "cont" or
"initial". "initial" means the popup comes up very early in the installation, short after the pre-script
has run. "cont" means, that the dialog with the question comes after the first reboot, when the system
boots for the very first time. Questions you answer during the "inital" stage, will write their answer
into the profile on the harddisk. You should know that if you enter cleartext passwords during "initial".
Of course it does not make sense to ask for a filesystem to use in the "cont" phase. The harddisk is already
partitioned at that stage and the question will have no effect.
- <para><screen><stage>cont</stage></screen></para></entry>
+ </para><screen><stage>cont</stage></screen></entry>
<entry>optional. The default is "initial"</entry>
</row>
<row>
<entry>selection</entry>
- <entry>the selection element contains a list of <entry> elements. Each entry represents a possible option
+ <entry><para>the selection element contains a list of <entry> elements. Each entry represents a possible option
for the user to choose. So the user can't enter a value in a textfield, but he can choose from a list
of values.
- <para><screen>
+ </para><screen>
<selection config:type="list">
<entry>
<value>
@@ -155,71 +155,69 @@
Extended3 Filesystem
</label>
</entry>
-</selection></screen></para></entry>
+</selection></screen></entry>
<entry>optional for type=string, not possible for type=boolean and a must have for type=symbol</entry>
</row>
<row>
<entry>dialog (available since SL 10.3 and SLES10 SP2)</entry>
- <entry>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have
+ <entry><para>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have
to specifiy the dialog-id with an integer. All questions with the same dialog-id are on the same dialog.
The dialogs are sorted by the id too.
- <para><screen><dialog config:type="integer">3</dialog></screen></para></entry>
+ </para><screen><dialog config:type="integer">3</dialog></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>element (available since SL 10.3 and SLES10 SP2)</entry>
- <entry>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have
+ <entry><para>Since OpenSUSE 10.3 you can have more than one question per dialog. To make that possible you have
to specifiy the element-id with an integer. The questions on a dialog are sorted by the id.
- <para><screen><element config:type="integer">1</element></screen></para></entry>
+ </para><screen><element config:type="integer">1</element></screen></entry>
<entry>optional (see dialog></entry>
</row>
<row>
<entry>frametitle (available since SL 10.3 and SLES10 SP2)</entry>
- <entry>Since OpenSUSE 10.3 you can have more than one question per dialog. Each question on a dialog has
+ <entry><para>Since OpenSUSE 10.3 you can have more than one question per dialog. Each question on a dialog has
a frame that can have a frametitle. A small caption for each question if you want so. Since openSUSE 11.3 you can put multiple elements into one frame. They have to have the same frametitle then.
- <para><screen><frametitle>User data</frametitle></screen></para></entry>
+ </para><screen><frametitle>User data</frametitle></screen></entry>
<entry>optional (default is no frametitle)</entry>
</row>
<row>
<entry>script (available since SL 10.3 not in SLES10 SP1)</entry>
- <entry>with 10.3 you can run scripts after a question has been answered (see the table below for detailed instructions about scripts)
- <para><screen><script>...</script></screen></para></entry>
+ <entry><para>with 10.3 you can run scripts after a question has been answered (see the table below for detailed instructions about scripts)
+ </para><screen><script>...</script></screen></entry>
<entry>optional (default is no script)</entry>
</row>
<row>
<entry>ok_label (available since openSUSE 11.2 / SLES11 SP2</entry>
- <entry>You can change the Label on the "Ok" button. The last element that specifies the label for a dialog wins.
- <para><screen><ok_label>Finish</ok_label></screen></para></entry>
+ <entry><para>You can change the Label on the "Ok" button. The last element that specifies the label for a dialog wins.
+ </para><screen><ok_label>Finish</ok_label></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>back_label (available since openSUSE 11.2 / SLES11 SP2</entry>
- <entry>You can change the Label on the "Back" button. The last element that specifies the label for a dialog wins.
- <para><screen><back_label>change values</back_label></screen></para></entry>
+ <entry><para>You can change the Label on the "Back" button. The last element that specifies the label for a dialog wins.
+ </para><screen><back_label>change values</back_label></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>timeout (available since openSUSE 11.2 / SLES11-SP2</entry>
- <entry>You can specify an integer here that is used as timeout in seconds. If the user does not answer the question before the timeout, the default value is taken as answer. When the user touches/changes any widget in the dialog, the timeout is turned off and the dialog has to be confirmed by the ok-button.
- <para><screen><timeout config:type="integer">30</timeout></screen></para></entry>
+ <entry><para>You can specify an integer here that is used as timeout in seconds. If the user does not answer the question before the timeout, the default value is taken as answer. When the user touches/changes any widget in the dialog, the timeout is turned off and the dialog has to be confirmed by the ok-button.
+ </para><screen><timeout config:type="integer">30</timeout></screen></entry>
<entry>optional. A missing value is interpreted as 0 which means that there is no timeout</entry>
</row>
<row>
<entry>default_value_script (available since openSUSE 11.2 / SLES11-SP2)</entry>
- <entry>you can run scripts to set the default value for a question(see the table below for detailed instructions about default value scripts). It's useful if you can "calculate" a useful default value, especially in combination with the "timeout" option.
- <para><screen><default_value_script>...</default_value_script></screen></para></entry>
+ <entry><para>you can run scripts to set the default value for a question(see the table below for detailed instructions about default value scripts). It's useful if you can "calculate" a useful default value, especially in combination with the "timeout" option.
+ </para><screen><default_value_script>...</default_value_script></screen></entry>
<entry>optional (default is no script)</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
<para>
The following elements must be between the <ask-list config:type="list"><ask><default_value_script>...</default_value_script>...</ask></ask-list> tags in the <general> section. It's available since 11.2 and SLES11-SP2
</para>
- <para>
<table frame='top'>
<title>XML representation</title>
<tgroup cols="3">
@@ -233,26 +231,24 @@
<tbody>
<row>
<entry>source</entry>
- <entry>the source code of the script. Whatever you echo to STDOUT will be used as default value for the ask-dialog. If your script has an exit code other than 0, the normal default element is used. Take care you echo with "echo -n" to suppress the '\n' and that you echo reasonable values and not "okay" for a boolean
- <para><screen><source>...</source></screen></para></entry>
+ <entry><para>the source code of the script. Whatever you echo to STDOUT will be used as default value for the ask-dialog. If your script has an exit code other than 0, the normal default element is used. Take care you echo with "echo -n" to suppress the '\n' and that you echo reasonable values and not "okay" for a boolean
+ </para><screen><source>...</source></screen></entry>
<entry>this value is required. Otherwise nothing would be executed</entry>
</row>
<row>
<entry>interpreter</entry>
- <entry>the interpreter to use
- <para><screen><interpreter>perl</interpreter></screen></para></entry>
+ <entry><para>the interpreter to use
+ </para><screen><interpreter>perl</interpreter></screen></entry>
<entry>default is shell (you can set "/bin/myinterpreter" as value too)</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
<para>
The following elements must be between the <ask-list config:type="list"><ask><script>...</script>...</ask></ask-list> tags in the <general> section. It's available since 10.3 (not SLES10 SP1).
</para>
- <para>
<table frame='top'>
<title>XML representation</title>
<tgroup cols="3">
@@ -266,44 +262,43 @@
<tbody>
<row>
<entry>filename</entry>
- <entry>the filename of the script
- <para><screen><filename>my_ask_script.sh</filename></screen></para></entry>
+ <entry><para>the filename of the script
+ </para><screen><filename>my_ask_script.sh</filename></screen></entry>
<entry>default is ask_script.sh</entry>
</row>
<row>
<entry>source</entry>
- <entry>the source code of the script. Together with "rerun_on_error" on you check the value that was entered for sanity (since 11.0 only). Your script can create a file "/tmp/next_dialog" with a dialog id in it. That's the next dialog autoyast will raise then. A value of -1 terminates the ask sequence. If that file is not created, autoyast will run the dialogs in a normal order (since 11.0 only)
- <para><screen><source>...</source></screen></para></entry>
+ <entry><para>the source code of the script. Together with "rerun_on_error" on you check the value that was entered for sanity (since 11.0 only). Your script can create a file "/tmp/next_dialog" with a dialog id in it. That's the next dialog autoyast will raise then. A value of -1 terminates the ask sequence. If that file is not created, autoyast will run the dialogs in a normal order (since 11.0 only)
+ </para><screen><source>...</source></screen></entry>
<entry>this value is required. Otherwise nothing would be executed</entry>
</row>
<row>
<entry>environment</entry>
- <entry>a boolean that passes the "value" of the answer to the question as an environment variable to the script. The variable is named "VAL".
- <para><screen><environment config:type="boolean">true</environment></screen></para></entry>
+ <entry><para>a boolean that passes the "value" of the answer to the question as an environment variable to the script. The variable is named "VAL".
+ </para><screen><environment config:type="boolean">true</environment></screen></entry>
<entry>optional (default is "false").</entry>
</row>
<row>
<entry>feedback</entry>
- <entry>a boolean that turns on feedback for the script execution. That means that STDOUT will be shown in a popup box that must be confirmed after the script execution.
- <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry>
+ <entry><para>a boolean that turns on feedback for the script execution. That means that STDOUT will be shown in a popup box that must be confirmed after the script execution.
+ </para><screen><feedback config:type="boolean">true</feedback></screen></entry>
<entry>optional (default is "false").</entry>
</row>
<row>
<entry>debug</entry>
- <entry>a boolean that turns on debugging for the script execution
- <para><screen><debug config:type="boolean">true</debug></screen></para></entry>
+ <entry><para>a boolean that turns on debugging for the script execution
+ </para><screen><debug config:type="boolean">true</debug></screen></entry>
<entry>optional (default is "true"). This value needs feedback to be turned on too.</entry>
</row>
<row>
<entry>rerun_on_error (available since openSUSE 11.0)</entry>
- <entry>a boolean that keeps the dialog open until the script has an exit code of 0 (zero). So you can parse and check the answers the user gave in the script and popup an error with the "feedback" option.
- <para><screen><rerun_on_error config:type="boolean">true</rerun_on_error></screen></para></entry>
+ <entry><para>a boolean that keeps the dialog open until the script has an exit code of 0 (zero). So you can parse and check the answers the user gave in the script and popup an error with the "feedback" option.
+ </para><screen><rerun_on_error config:type="boolean">true</rerun_on_error></screen></entry>
<entry>optional (default is "false"). This value should be used together with the feedback option.</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
<para>
Below you can see an example of the usage of the "ask" feature.
</para>
@@ -414,7 +409,7 @@
<para>
Since openSUSE 11.0 you can verify the answer of a question with a script like this:
</para>
-<para>
+
<screen>
<ask>
<script>
@@ -444,9 +439,6 @@
<default>enter your hostname here</default>
</ask>
</screen>
-</para>
-
-
</section>
Modified: branches/tmp/ke/autoinstallation/doc/xml/BootloaderSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/BootloaderSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/BootloaderSection.xml Tue Oct 25 17:22:51 2011
@@ -22,6 +22,7 @@
<para>This documentation is for yast2-bootloader and is is valid for SLE11 and openSUSE 11.0+. For older versions please use the documentation that comes with your distribution in /usr/share/doc/packages/autoyast2/</para>
<para>
General scope of autoyast profile only bootloader part.
+ </para>
<screen>
<bootloader>
<device_map config:type="list">
@@ -39,7 +40,7 @@
</sections>
</bootloader>
</screen>
-</para>
+
<section><title>Device map</title>
<para>
You can define devices and their order in device.map but it is not necessary. yast2-bootloader checks the devices during the installation and proposes a device.map by itself. It can happen that the order of the devices is wrong or you have defined a different order than it is in the BIOS (please take care about changes there. it can leads to unbootable system).
@@ -56,6 +57,7 @@
<section><title>Globals</title>
<para>
This is an important part where you can define where to install GRUB and also how the boot process will work. It is not necessary to define this part as mentioned before, yast2-bootloader proposes a configuration by itself and so this is optional. Usually the AutoYaST profile includes only this part and all other parts are added automatically during installation by yast2-bootloader. Unless you have some special needs, you don't have to specify the bootloader config in the XML file.
+ </para>
<screen>
<global>
<activate>true</activate>
@@ -65,7 +67,6 @@
<timeout config:type="integer">10</timeout>
</global>
</screen>
- </para>
<informaltable frame='top'>
<tgroup cols="3">
@@ -82,7 +83,7 @@
<entry>
<para>set boot flag on boot partition. The boot partition can be "/" if there is no separate /boot partition. If the boot partition is on logical partition, the boot flag is set to the extended partition.
</para>
- <para><screen><activate>true</activate></screen></para>
+ <para><literal><activate>true</activate></literal></para>
</entry>
<entry></entry>
</row>
@@ -92,7 +93,7 @@
<para>
name(title) of the default boot section from menu.lst
</para>
- <para><screen><default>openSUSE 11.2 - 2.6.31.5-0.1</default></screen></para>
+ <para><literal><default>openSUSE 11.2 - 2.6.31.5-0.1</default></literal></para>
</entry>
<entry></entry>
</row>
@@ -102,7 +103,7 @@
<para>
path to the graphical boot menu (/boot/message). 'none' means don't use graphical boot menu
</para>
- <para><screen><gfxmenu>(hd0,1)/boot/message</gfxmenu></screen></para>
+ <para><literal><gfxmenu>(hd0,1)/boot/message</gfxmenu></literal></para>
</entry>
<entry></entry>
</row>
@@ -112,7 +113,7 @@
<para>
timeout in seconds for automatic booting the default boot section from menu.lst
</para>
- <para><screen><timeout config:type="integer">10</timeout></screen></para>
+ <para><literal><timeout config:type="integer">10</timeout></literal></para>
</entry>
<entry></entry>
</row>
@@ -122,7 +123,7 @@
<para>
write generic boot code to MBR. (It is ignored if boot_mbr is set to true)
</para>
- <para><screen><generic_mbr>false</generic_mbr></screen></para>
+ <para><literal><generic_mbr>false</generic_mbr></literal></para>
</entry>
<entry></entry>
</row>
@@ -132,7 +133,7 @@
<para>
write GRUB to MBR of the first disk in the order (device.map include order of disks)
</para>
- <para><screen><boot_mbr>false</boot_mbr></screen></para>
+ <para><literal><boot_mbr>false</boot_mbr></literal></para>
</entry>
<entry></entry>
</row>
@@ -142,7 +143,7 @@
<para>
write GRUB to separate /boot partition (if separate /boot partition missing GRUB will be written to "/")
</para>
- <para><screen><boot_boot>false</boot_boot></screen></para>
+ <para><literal><boot_boot>false</boot_boot></literal></para>
</entry>
<entry></entry>
</row>
@@ -152,7 +153,7 @@
<para>
write GRUB to "/" partition
</para>
- <para><screen><boot_root>false</boot_root></screen></para>
+ <para><literal><boot_root>false</boot_root></literal></para>
</entry>
<entry></entry>
</row>
@@ -162,7 +163,7 @@
<para>
write GRUB to the extended partition (it is important if you want to use a generic boot code and the "boot" partition is logical) NOTE: if the boot partition is logical it should use boot_mbr (write GRUB to MBR) instead of generic_mbr.
</para>
- <para><screen><boot_extended>false</boot_extended></screen></para>
+ <para><literal><boot_extended>false</boot_extended></literal></para>
</entry>
<entry></entry>
</row>
@@ -172,7 +173,7 @@
<para>
write GRUB to custom device.
</para>
- <para><screen><boot_custom>/dev/sda3</boot_custom></screen></para>
+ <para><literal><boot_custom>/dev/sda3</boot_custom></literal></para>
</entry>
<entry></entry>
</row>
@@ -182,7 +183,7 @@
<para>
use trusted GRUB instead of the classical GRUB (gfxmenu is deleted automatically if this option is true) please doesn't use trusted GRUB if your hardware doesn't support it.
</para>
- <para><screen><trusted_grub>false</trusted_grub></screen></para>
+ <para><literal><trusted_grub>false</trusted_grub></literal></para>
</entry>
<entry></entry>
</row>
@@ -192,7 +193,7 @@
<para>
internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file.
</para>
- <para><screen></screen></para>
+ <para><literal></literal></para>
</entry>
<entry></entry>
</row>
@@ -279,7 +280,7 @@
<para>
list of kernel args but without(!) vga= and root=
</para>
- <para><screen><append>splash=silent quiet showopts</append></screen></para>
+ <para><literal><append>splash=silent quiet showopts</append></literal></para>
</entry>
<entry></entry>
</row>
@@ -289,7 +290,7 @@
<para>
path to the kernel
</para>
- <para><screen><image>(hd0,0)/vmlinuz-2.6.31-10</image></screen></para>
+ <para><literal><image>(hd0,0)/vmlinuz-2.6.31-10</image></literal></para>
</entry>
<entry></entry>
</row>
@@ -299,7 +300,7 @@
<para>
path to the initrd
</para>
- <para><screen><initrd>(hd0,0)/my-initrd</initrd></screen></para>
+ <para><literal><initrd>(hd0,0)/my-initrd</initrd></literal></para>
</entry>
<entry></entry>
</row>
@@ -309,7 +310,7 @@
<para>
internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file.
</para>
- <para><screen></screen></para>
+ <para><literal></literal></para>
</entry>
<entry></entry>
</row>
@@ -319,7 +320,7 @@
<para>
name of section
</para>
- <para><screen><name>Productive System</name></screen></para>
+ <para><literal><name>Productive System</name></literal></para>
</entry>
<entry></entry>
</row>
@@ -329,7 +330,7 @@
<para>
internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc.
</para>
- <para><screen><original_name>linux</original_name></screen></para>
+ <para><literal><original_name>linux</original_name></literal></para>
</entry>
<entry></entry>
</row>
@@ -339,7 +340,7 @@
<para>
location of the root partition ("/")
</para>
- <para><screen><root>/dev/mapper/sil_ajacccbhejai_part3</root></screen></para>
+ <para><literal><root>/dev/mapper/sil_ajacccbhejai_part3</root></literal></para>
</entry>
<entry></entry>
</row>
@@ -349,7 +350,7 @@
<para>
type of section it could (image/xen/other/menu)
</para>
- <para><screen><type>xen</type></screen></para>
+ <para><literal><type>xen</type></literal></para>
</entry>
<entry></entry>
</row>
@@ -359,7 +360,7 @@
<para>
kernel arg for vga (vga=)
</para>
- <para><screen><vgamode>0x31a</vgamode></screen></para>
+ <para><literal><vgamode>0x31a</vgamode></literal></para>
</entry>
<entry></entry>
</row>
@@ -369,7 +370,7 @@
<para>
path to xen.gz
</para>
- <para><screen><xen>(hd0,0)/xen.gz</xen></screen></para>
+ <para><literal><xen>(hd0,0)/xen.gz</xen></literal></para>
</entry>
<entry></entry>
</row>
@@ -379,7 +380,7 @@
<para>
kernel args for XEN
</para>
- <para><screen><xen_append></xen_append></screen></para>
+ <para><literal><xen_append></xen_append></literal></para>
</entry>
<entry></entry>
</row>
@@ -404,7 +405,7 @@
<para>
internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file.
</para>
- <para><screen></screen></para>
+ <para><literal></literal></para>
</entry>
<entry></entry>
</row>
@@ -414,7 +415,7 @@
<para>
name or title of section
</para>
- <para><screen><name>Floppy</name></screen></para>
+ <para><literal><name>Floppy</name></literal></para>
</entry>
<entry></entry>
</row>
@@ -424,7 +425,7 @@
<para>
internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc.
</para>
- <para><screen><original_name>linux</original_name></screen></para>
+ <para><literal><original_name>linux</original_name></literal></para>
</entry>
<entry></entry>
</row>
@@ -434,7 +435,7 @@
<para>
type of section it could (image/xen/other/menu)
</para>
- <para><screen><type>other</type></screen></para>
+ <para><literal><type>other</type></literal></para>
</entry>
<entry></entry>
</row>
@@ -444,7 +445,7 @@
<para>
offset in chainloader (used only in grub)
</para>
- <para><screen><blockoffset>1</blockoffset></screen></para>
+ <para><literal><blockoffset>1</blockoffset></literal></para>
</entry>
<entry></entry>
</row>
@@ -454,7 +455,7 @@
<para>
partition part for chainloader (so chainloader+blockoffset get final chainloader item in grub)
</para>
- <para><screen><chainloader>/dev/fd0</chainloader></screen></para>
+ <para><literal><chainloader>/dev/fd0</chainloader></literal></para>
</entry>
<entry></entry>
</row>
@@ -464,7 +465,7 @@
<para>
with/without checking root
</para>
- <para><screen><noverifyroot>true</noverifyroot></screen></para>
+ <para><literal><noverifyroot>true</noverifyroot></literal></para>
</entry>
<entry></entry>
</row>
@@ -474,7 +475,7 @@
<para>
it is special for windows and it means remapping disk which makes the second disk the first e.g. map (hd0) (hd1) map (hd1) (hd0)
</para>
- <para><screen><remap>false</remap></screen></para>
+ <para><literal><remap>false</remap></literal></para>
</entry>
<entry></entry>
</row>
@@ -484,7 +485,7 @@
<para>
add the makeactive argument for chainloader section
</para>
- <para><screen><makeactive>false</makeactive></screen></para>
+ <para><literal><makeactive>false</makeactive></literal></para>
</entry>
<entry></entry>
</row>
@@ -509,7 +510,7 @@
<para>
internal option which means cache id for perl-Bootloader. Please don't use it or change it in a cloned XML file.
</para>
- <para><screen></screen></para>
+ <para><literal></literal></para>
</entry>
<entry></entry>
</row>
@@ -519,7 +520,7 @@
<para>
name or title of section
</para>
- <para><screen><name>Floppy</name></screen></para>
+ <para><literal><name>Floppy</name></literal></para>
</entry>
<entry></entry>
</row>
@@ -529,7 +530,7 @@
<para>
internal name of section parsed by YaST from a comment in the config file. There are some rules for names and original_name helps to determine if boot section is linux or failsafe and for chainloader it helps to determine if it is windows or other linux/floppy etc. Please use simple original_name: linux, xen, windows, floppy etc.
</para>
- <para><screen><original_name>linux</original_name></screen></para>
+ <para><literal><original_name>linux</original_name></literal></para>
</entry>
<entry></entry>
</row>
@@ -539,7 +540,7 @@
<para>
type of section it could (image/xen/other/menu)
</para>
- <para><screen><type>other</type></screen></para>
+ <para><literal><type>other</type></literal></para>
</entry>
<entry></entry>
</row>
@@ -549,7 +550,7 @@
<para>
path to menu.lst config file
</para>
- <para><screen><configfile>1</configfile></screen></para>
+ <para><literal><configfile>1</configfile></literal></para>
</entry>
<entry></entry>
</row>
@@ -559,7 +560,7 @@
<para>
device name for loading menu.lst from other installation of linux
</para>
- <para><screen><root>/dev/sda1</root></screen></para>
+ <para><literal><root>/dev/sda1</root></literal></para>
</entry>
<entry></entry>
</row>
Modified: branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/GeneralSection.xml Tue Oct 25 17:22:51 2011
@@ -130,6 +130,7 @@
</para>
<para>
This is the list of proposals for openSUSE 11.1 are (you can find that in the control.xml on the installation source too):
+ </para>
<itemizedlist>
<listitem>
<para>
@@ -182,7 +183,6 @@
</para>
</listitem>
</itemizedlist>
- </para>
<para>
The wait section was invented with openSUSE 11.1 and SLES11. You can let AutoYaST sleep before and after each module during the second stage.
You can run scripts and/or you can pass a value (in seconds) for AutoYaST to sleep. In the example above AutoYaST will sleep for 15 seconds (10+5) before
Modified: branches/tmp/ke/autoinstallation/doc/xml/Installation.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/Installation.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/Installation.xml Tue Oct 25 17:22:51 2011
@@ -124,6 +124,7 @@
</para>
<para>
Here is a small example of a "/srv/tftp/pxelinux.cfg/default" file:
+ </para>
<screen>
default SLES9
@@ -136,7 +137,6 @@
label hd·
LOCALBOOT 0
</screen>
- </para>
<para>
It's recommended to add the vga=... parameter with a valid value for graphical
installations, to trigger an installation with the frame buffer device instead
@@ -144,6 +144,7 @@
</para>
<para>
Here is as a small example my "/etc/dhcp.conf" file:
+ </para>
<screen>
option domain-name-servers 192.168.66.1;
default-lease-time 600;
@@ -171,7 +172,6 @@
filename "pxelinux.0";
}
</screen>
- </para>
<para>
A problem you might run into if you do installation via PXE is, that the
installation will run into an endless loop, because after the first reboot,
@@ -188,6 +188,7 @@
<para>
Another way is to use autoyast to upload a new PXE boot configuration for that host.
That is done via autoyast profile like this:
+ </para>
<screen>
<![CDATA[
<pxe>
@@ -205,7 +206,8 @@
</pxe>
]]>
</screen>
- This will upload a new configuration for the actual machine to the tftp server short
+ <para>
+ This will upload a new configuration for the actual machine to the tftp server short
before the first reboot happens. In most installations the TFTP daemon runs as user
"nobody". You have to make sure that that user has write permissions to the "pxelinux.cfg"
directory if you use that mechanism.
@@ -552,10 +554,10 @@
<listitem>
<para>
Specify the exact location of the control file:
+ </para>
<screen>
autoyast=http://192.168.1.1/control-files/client01.xml
</screen>
- </para>
</listitem>
<listitem>
<para>
Modified: branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/KDumpSection.xml Tue Oct 25 17:22:51 2011
@@ -96,7 +96,6 @@
For the <emphasis>amount</emphasis> of memory, following values are recommended:
</para>
- <para>
<table frame="top">
<title>Recommended values for the reserved memory amount</title>
<tgroup cols="2">
@@ -139,7 +138,6 @@
</tbody>
</tgroup>
</table>
- </para>
<para>
To make things even more complicated, there's a so-called <emphasis>extended
@@ -149,9 +147,7 @@
on one machine. The syntax is:
</para>
- <para>
<screen>BEGIN_RANGE_1-END_RANGE_1:AMOUNT_1,BEGIN_RANGE_2-END_RANGE_2:AMOUNT_2@OFFSET</screen>
- </para>
<para>
In that syntax <literal>BEGIN_RANGE_1</literal> is the start of the first
@@ -168,7 +164,6 @@
memory reservation:
</para>
- <para>
<table frame='top'>
<title>XML representation of the memory reservation settings</title>
<tgroup cols="3">
@@ -182,20 +177,19 @@
<tbody>
<row>
<entry>add_crash_kernel</entry>
- <entry>If the memory should be reserved, that basically enables or disables kdump.
- <para><screen><add_crash_kernel config:type="boolean">true</add_crash_kernel></screen></para></entry>
+ <entry><para>If the memory should be reserved, that basically enables or disables kdump.
+ </para><screen><add_crash_kernel config:type="boolean">true</add_crash_kernel></screen></entry>
<entry>required</entry>
</row>
<row>
<entry>crash_kernel</entry>
- <entry>The syntax of the crashkernel command line as discussed above.
- <para><screen><crash_kernel>256M:64M</crash_kernel></screen></para></entry>
+ <entry><para>The syntax of the crashkernel command line as discussed above.
+ </para><screen><crash_kernel>256M:64M</crash_kernel></screen></entry>
<entry>required</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
</section>
<!-- }}} -->
@@ -304,7 +298,6 @@
<title>
Summary
</title>
- <para>
<table frame='top'>
<title>XML representation of the dump target settings</title>
<tgroup cols="3">
@@ -318,38 +311,37 @@
<tbody>
<row>
<entry>KDUMP_SAVEDIR</entry>
- <entry>An URL that specifies the target to which the dump and related files will be saved.
- <para><screen><KDUMP_SAVEDRIR>file:///var/crash/</KDUMP_SAVEDIR></screen></para></entry>
+ <entry><para>An URL that specifies the target to which the dump and related files will be saved.
+ </para><screen><KDUMP_SAVEDRIR>file:///var/crash/</KDUMP_SAVEDIR></screen></entry>
<entry>required</entry>
</row>
<row>
<entry>KDUMP_COPY_KERNEL</entry>
- <entry>If not only the dump itself should be saved to <literal>KDUMP_SAVEDIR</literal> but
+ <entry><para>If not only the dump itself should be saved to <literal>KDUMP_SAVEDIR</literal> but
also the kernel and its debugging information (if installed).
- <para><screen><KDUMP_COPY_KERNEL>false</KDUMP_COPY_KERNEL></screen></para></entry>
+ </para><screen><KDUMP_COPY_KERNEL>false</KDUMP_COPY_KERNEL></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KDUMP_FREE_DISK_SIZE</entry>
<entry>
- The number of megabytes that should always be free after saving the dump. If that
+ <para>The number of megabytes that should always be free after saving the dump. If that
space would be below that value, the dump will not be copied.
- <para><screen><KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE></screen></para></entry>
+ </para><screen><KDUMP_FREE_DISK_SIZE>64</KDUMP_FREE_DISK_SIZE></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KDUMP_KEEP_OLD_DUMPS</entry>
<entry>
- The number of dumps that are kept (i.e., not deleted) if <literal>KDUMP_SAVEDIR</literal>
+ <para>The number of dumps that are kept (i.e., not deleted) if <literal>KDUMP_SAVEDIR</literal>
points to a local directory. Specify 0 if you don't want to delete dumps at all and
specify -1 if all dumps (except the one that is just saved) should be deleted.
- <para><screen><KDUMP_KEEP_OLD_DUMPS>4</KDUMP_KEEP_OLD_DUMPS></screen></para></entry>
+ </para><screen><KDUMP_KEEP_OLD_DUMPS>4</KDUMP_KEEP_OLD_DUMPS></screen></entry>
<entry>optional</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
</section>
<!-- }}} -->
@@ -389,7 +381,6 @@
That may be added in future.
</para>
- <para>
<!-- {{{ Table: XML representation of the email notification settings -->
<table frame='top'>
<title>XML representation of the email notification settings</title>
@@ -412,41 +403,40 @@
</row>
<row>
<entry>KDUMP_NOTIFICATION_CC</entry>
- <entry>Zero, one or more recipients that are in the Cc line of the notification mail.
- <para><screen><KDUMP_NOTIFICATION_CC>spam(a)suse.de devnull(a)suse.de</KDUMP_NOTIFICATION_CC></screen></para></entry>
+ <entry><para>Zero, one or more recipients that are in the Cc line of the notification mail.
+ </para><screen><KDUMP_NOTIFICATION_CC>spam(a)suse.de devnull(a)suse.de</KDUMP_NOTIFICATION_CC></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KDUMP_SMTP_SERVER</entry>
- <entry>
+ <entry><para>
Host name of the SMTP server that will be used for the mail delivery. Please note
that the SMTP authentication is supported (see <literal>KDUMP_SMTP_USER</literal>
and <literal>KDUMP_SMTP_PASSWORD</literal>) but TSL and SSL are <emphasis>not</emphasis>
supported.
- <para><screen><KDUMP_SMTP_SERVER>email.suse.de</KDUMP_SMTP_SERVER></screen></para></entry>
+ </para><screen><KDUMP_SMTP_SERVER>email.suse.de</KDUMP_SMTP_SERVER></screen></entry>
<entry>optional (email notification is disabled if empty)</entry>
</row>
<row>
<entry>KDUMP_SMTP_USER</entry>
- <entry>
+ <entry><para>
User name that is used together with <literal>KDUMP_SMTP_PASSWORD</literal>
for SMTP authentication.
- <para><screen><KDUMP_SMTP_USER>bwalle</KDUMP_SMTP_USER></screen></para></entry>
+ </para><screen><KDUMP_SMTP_USER>bwalle</KDUMP_SMTP_USER></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KDUMP_SMTP_PASSWORD</entry>
- <entry>
+ <entry><para>
Password that is used together with <literal>KDUMP_SMTP_USER</literal>
for SMTP authentication.
- <para><screen><KDUMP_SMTP_PASSWORD>geheim</KDUMP_SMTP_PASSWORD></screen></para></entry>
+ </para><screen><KDUMP_SMTP_PASSWORD>geheim</KDUMP_SMTP_PASSWORD></screen></entry>
<entry>optional</entry>
</row>
</tbody>
</tgroup>
</table>
<!-- }}} -->
- </para>
</section>
<!-- }}} -->
<!-- {{{ Kdump kernel settings -->
@@ -477,7 +467,6 @@
and you want to specify the whole command line, set <literal>KDUMP_COMMANDLINE</literal>.
</para>
- <para>
<!-- {{{ Table: XML representation of the kernel settings -->
<table frame='top'>
<title>XML representation of the kernel settings</title>
@@ -492,31 +481,30 @@
<tbody>
<row>
<entry>KDUMP_KERNELVER</entry>
- <entry>Version string for the kernel that will be used for kdump. Leave it
+ <entry><para>Version string for the kernel that will be used for kdump. Leave it
empty to use the auto-detection mechanism (strongly recommended).
- <para><screen><KDUMP_KERNELVER>2.6.27-default</KDUMP_KERNELVER></screen></para></entry>
+ </para><screen><KDUMP_KERNELVER>2.6.27-default</KDUMP_KERNELVER></screen></entry>
<entry>optional (auto-detection if empty)</entry>
</row>
<row>
<entry>KDUMP_COMMANDLINE_APPEND</entry>
- <entry>Additional command line parameters for the kdump kernel.
- <para><screen><KDUMP_COMMANDLINE_APPEND>console=ttyS0,57600</KDUMP_COMMANDLINE_APPEND></screen></para></entry>
+ <entry><para>Additional command line parameters for the kdump kernel.
+ </para><screen><KDUMP_COMMANDLINE_APPEND>console=ttyS0,57600</KDUMP_COMMANDLINE_APPEND></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KDUMP_COMMANDLINE</entry>
- <entry>
+ <entry><para>
Overwrite the automatically generated kdump command line. Use with care.
Normally <literal>KDUMP_COMMANDLINE_APPEND</literal> is the setting you're
looking for.
- <para><screen><KDUMP_COMMANDLINE_APPEND>root=/dev/sda5 maxcpus=1 irqpoll</KDUMP_COMMANDLINE></screen></para></entry>
+ </para><screen><KDUMP_COMMANDLINE_APPEND>root=/dev/sda5 maxcpus=1 irqpoll</KDUMP_COMMANDLINE></screen></entry>
<entry>optional (email notification is disabled if empty)</entry>
</row>
</tbody>
</tgroup>
</table>
<!-- }}} -->
- </para>
</section>
<!-- }}} -->
<!-- {{{ Expert settings -->
@@ -525,7 +513,6 @@
Expert settings
</title>
- <para>
<!-- {{{ Table: XML representation of the expert settings -->
<table frame='top'>
<title>XML representation of the expert settings</title>
@@ -540,31 +527,30 @@
<tbody>
<row>
<entry>KDUMP_IMMEDIATE_REBOOT</entry>
- <entry><literal>true</literal> if the system should be rebooted automatically
+ <entry><para><literal>true</literal> if the system should be rebooted automatically
after the dump has been saved, <literal>false</literal> otherwise. The default
is to reboot the system automatically.
- <para><screen><KDUMP_IMMEDIATE_REBOOT>true</KDUMP_IMMEDIATE_REBOOT></screen></para></entry>
+ </para><screen><KDUMP_IMMEDIATE_REBOOT>true</KDUMP_IMMEDIATE_REBOOT></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KDUMP_VERBOSE</entry>
- <entry>Bitmask that specifies how to verbose the kdump process should be.
+ <entry><para>Bitmask that specifies how to verbose the kdump process should be.
Read kdump(5) for details.
- <para><screen><KDUMP_VERBOSE>3</KDUMP_VERBOSE></screen></para></entry>
+ </para><screen><KDUMP_VERBOSE>3</KDUMP_VERBOSE></screen></entry>
<entry>optional</entry>
</row>
<row>
<entry>KEXEC_OPTIONS</entry>
- <entry>Additional options that are passed to <application>kexec</application>
+ <entry><para>Additional options that are passed to <application>kexec</application>
when loading the kdump kernel. Normally empty.
- <para><screen><KEXEC_OPTIONS>--noio</KEXEC_OPTIONS></screen></para></entry>
+ </para><screen><KEXEC_OPTIONS>--noio</KEXEC_OPTIONS></screen></entry>
<entry>optional</entry>
</row>
</tbody>
</tgroup>
</table>
<!-- }}} -->
- </para>
</section>
<!-- }}} -->
Modified: branches/tmp/ke/autoinstallation/doc/xml/NetworkSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/NetworkSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/NetworkSection.xml Tue Oct 25 17:22:51 2011
@@ -34,9 +34,11 @@
</para>
<para>
In the networking section, when this option is set to true (default is false, this option is available since openSUSE 11.2 but not SLES11):
+ </para>
<screen>
<keep_install_network config:type="boolean">true</keep_install_network>
</screen>
+ <para>
YaST will keep network settings created during installation (via Linuxrc)
and/or merge it with network settings from the AutoYaST profile (if these are defined).
AutoYaST settings have higher priority than already present configuration files.
Modified: branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/PartitioningSection.xml Tue Oct 25 17:22:51 2011
@@ -45,49 +45,49 @@
<tbody>
<row>
<entry>device</entry>
- <entry>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>.
- <para><screen><device>/dev/hda</device></screen></para>
+ <entry><para>the device you want to configure in this section. Since SUSE Linux 10.1 and SLES10, you can use persistent device names via id, like <emphasis>/dev/disk/by-id/ata-WDC_WD3200AAKS-75L9A0_WD-WMAV27368122</emphasis>. With SLES10 SP1 and SUSE Linux 10.2, <emphasis>by-path</emphasis> is possible too like <emphasis>/dev/disk/by-path/pci-0001:00:03.0-scsi-0:0:0:0</emphasis>.</para>
+ <para><literal><device>/dev/hda</device></literal></para>
</entry>
<entry>optional. If left out, autoyast tries to guess the device. A RAID must always have "/dev/md" as device</entry>
</row>
<row>
<entry>initialize</entry>
- <entry>if set to true, the partition table gets wiped out before autoyast starts the partition calculation
-<para><screen><initialize config:type="boolean">true</initialize></screen></para>
+ <entry><para>if set to true, the partition table gets wiped out before autoyast starts the partition calculation</para>
+<para><literal><initialize config:type="boolean">true</initialize></literal></para>
</entry>
<entry>optional. The default is false.</entry>
</row>
<row>
<entry>is_lvm_vg</entry>
- <entry>This tells autoyast that this device is not a physical device but a LVM volume group (see LVM configuration below)
-<para><screen><is_lvm_vg config:type="boolean">true</is_lvm_vg></screen></para>
+ <entry><para>This tells autoyast that this device is not a physical device but a LVM volume group (see LVM configuration below)</para>
+<para><literal><is_lvm_vg config:type="boolean">true</is_lvm_vg></literal></para>
</entry>
- <entry>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is a LVM volume group. The default is false.</entry>
+ <entry><para>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is a LVM volume group. The default is false.</para></entry>
</row>
<row>
<entry>is_evms_vg</entry>
- <entry>this tells autoyast that this device is not a physical device but an EVMS volume group (see EVMS configuration below)
-<para><screen><is_evms_vg config:type="boolean">true</is_evms_vg></screen></para>
+ <entry><para>this tells autoyast that this device is not a physical device but an EVMS volume group (see EVMS configuration below)</para>
+<para><literal><is_evms_vg config:type="boolean">true</is_evms_vg></literal></para>
</entry>
- <entry>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is an EVMS volume group. The default is false.</entry>
+ <entry><para>DEPRECATED since SLES10SP1 and SL10.2 - use <emphasis>type</emphasis> instead. Must be true if this device is an EVMS volume group. The default is false.</para></entry>
</row>
<row>
<entry>partitions</entry>
- <entry>this is a list of <partition> entries (see table below)
-<para><screen><partitions config:type="list"><partition>...</partition>...</partitions></screen></para>
+ <entry><para>this is a list of <partition> entries (see table below)</para>
+<para><literal><partitions config:type="list"><partition>...</partition>...</partitions></literal></para>
</entry>
<entry>optional. If no partition is specified, autoyast will create it's own idea of a nice partitioning (see Automated Partitioning below).</entry>
</row>
<row>
<entry>pesize</entry>
- <entry>this value makes only sense with LVM/EVMS.
-<para><screen><pesize>8M</pesize></screen></para>
+ <entry><para>this value makes only sense with LVM/EVMS.</para>
+<para><literal><pesize>8M</pesize></literal></para>
</entry>
<entry>optional. Default is 4M for EVMS/LVM volume groups.</entry>
</row>
<row>
<entry>use</entry>
- <entry>this parameter tells autoyast which strategy it shall use to partition the harddisc.
+ <entry><para>this parameter tells autoyast which strategy it shall use to partition the harddisc.</para>
<para>You can choose between:</para>
<itemizedlist>
<listitem>
@@ -108,8 +108,8 @@
</row>
<row>
<entry>type</entry>
- <entry>this value describes the type of the <emphasis>drive</emphasis> and is a replacement for
-<emphasis>is_lvm_vg</emphasis> and <emphasis>is_evms_vg</emphasis> used in SLES10 and SL10.1
+ <entry><para>this value describes the type of the <emphasis>drive</emphasis> and is a replacement for
+<emphasis>is_lvm_vg</emphasis> and <emphasis>is_evms_vg</emphasis> used in SLES10 and SL10.1</para>
<para>You can choose between:</para>
<itemizedlist>
<listitem>
@@ -123,13 +123,13 @@
</listitem>
</itemizedlist>
-<para><screen><type config:type="symbol">CT_LVM</type></screen></para>
+<para><literal><type config:type="symbol">CT_LVM</type></literal></para>
</entry>
<entry>optional. Default is CT_DISK for a normal physical harddisk.</entry>
</row>
<row>
<entry>disklabel</entry>
- <entry>this value describes the type of the partition table
+ <entry><para>this value describes the type of the partition table</para>
<para>You can choose between:</para>
<itemizedlist>
<listitem>
@@ -140,14 +140,14 @@
</listitem>
</itemizedlist>
-<para><screen><disklabel>gpt</disklabel></screen></para>
+<para><literal><disklabel>gpt</disklabel></literal></para>
</entry>
<entry>optional and available since openSUSE 12.1 and SLES11 SP2. Default is to let yast decide what makes sense (msdos in most cases)</entry>
</row>
<row>
<entry>keep_unknown_lv</entry>
- <entry>This value only makes sense for type=CT_LVM drives. If you are reusing a LVG and you set this to true, all existing LVs in that VG won't be touched unless they are specified in the <partitioning> section. So you can keep existing LVs without need to specify them.
-<para><screen><keep_unknown_lv config:type="boolean">false</keep_unknown_lv></screen></para>
+ <entry><para>This value only makes sense for type=CT_LVM drives. If you are reusing a LVG and you set this to true, all existing LVs in that VG won't be touched unless they are specified in the <partitioning> section. So you can keep existing LVs without need to specify them.</para>
+<para><literal><keep_unknown_lv config:type="boolean">false</keep_unknown_lv></literal></para>
</entry>
<entry>optional and available since openSUSE 12.1 and SLES11 SP2. The default is false</entry>
</row>
@@ -177,7 +177,7 @@
<para>
the "create" tells autoyast if this partition must be created or if it's already existing
</para>
- <para><screen><create config:type="boolean">false</create></screen></para>
+ <para><literal><create config:type="boolean">false</create></literal></para>
</entry>
<entry>if set to false, there must be some information for autoyast which partition this is (like with partition_nr)</entry>
</row>
@@ -187,8 +187,8 @@
<para>
the mountpoint of this partition.
</para>
- <para><screen><mount>/</mount></screen></para>
- <para><screen><mount>swap</mount></screen></para>
+ <para><literal><mount>/</mount></literal></para>
+ <para><literal><mount>swap</mount></literal></para>
</entry>
<entry>you should have at least a root partition (/) and a swap partition</entry>
</row>
@@ -198,7 +198,7 @@
<para>
mount options for this partition
</para>
- <para><screen><fstopt>ro,noatime,user,data=ordered,acl,user_xattr</fstopt></screen></para>
+ <para><literal><fstopt>ro,noatime,user,data=ordered,acl,user_xattr</fstopt></literal></para>
</entry>
<entry>see "man mount" for the mountoptions you can use</entry>
</row>
@@ -208,7 +208,7 @@
<para>
the label the partition has (useful for the "mountby" parameter - see below).
</para>
- <para><screen><label>mydata</label></screen></para>
+ <para><literal><label>mydata</label></literal></para>
</entry>
<entry>see "man e2label" for example.</entry>
</row>
@@ -218,7 +218,7 @@
<para>
the uuid the partition has (only useful for the "mountby" parameter - see below).
</para>
- <para><screen><uuid>1b4e28ba-2fa1-11d2-883f-b9a761bde3fb</uuid></screen></para>
+ <para><literal><uuid>1b4e28ba-2fa1-11d2-883f-b9a761bde3fb</uuid></literal></para>
</entry>
<entry>see "man uuidgen"</entry>
</row>
@@ -234,7 +234,7 @@
with SUSE Linux 10.2 and SLES10 SP1, you can specify the the size in percentage. So 10% will use 10% of the size
of the harddisk/VG. You can mix auto,max,sizes and percentage like you want.
</para>
- <para><screen><size>10G</size></screen></para>
+ <para><literal><size>10G</size></literal></para>
</entry>
<entry></entry>
</row>
@@ -244,7 +244,7 @@
<para>
shall autoyast format the partition?
</para>
- <para><screen><format config:type="boolean">false</format></screen></para>
+ <para><literal><format config:type="boolean">false</format></literal></para>
</entry>
<entry>if "create" is true, then it's very likely that this is true too</entry>
</row>
@@ -253,6 +253,7 @@
<entry>
<para>
what filesystem is used on this partition?
+ </para>
<itemizedlist>
<listitem>
<para>reiser (the default)</para>
@@ -273,8 +274,8 @@
<para>swap</para>
</listitem>
</itemizedlist>
- </para>
- <para><screen><filesystem config:type="symbol">reiser</filesystem></screen></para>
+
+ <para><literal><filesystem config:type="symbol">reiser</filesystem></literal></para>
</entry>
<entry>optional. The default is reiser</entry>
</row>
@@ -286,7 +287,7 @@
autoyast which partition you mean by the partition_nr. You can force autoyast to create only
primary partitions by configuring only partition numbers below 5.
</para>
- <para><screen><partition_nr config:type="integer">2</partition_nr></screen></para>
+ <para><literal><partition_nr config:type="integer">2</partition_nr></literal></para>
</entry>
<entry>in most cases nr. 1-4 are primary partitions and 5-... are logical partitions</entry>
</row>
@@ -297,7 +298,7 @@
the partition_id configures the id of the partition. If you want something else than 131
for linux partition or 130 for swap, you must configure that with partition_id.
</para>
- <para><screen><partition_id config:type="integer">131</partition_id></screen></para>
+ <para><literal><partition_id config:type="integer">131</partition_id></literal></para>
</entry>
<entry>the default is 131 for linux partition. 130 for swap is set by autoyast itself too.</entry>
</row>
@@ -307,7 +308,7 @@
<para>
look at partition_id above. For historical reasons they represent the same.
</para>
- <para><screen><filesystem_id config:type="integer">131</filesystem_id></screen></para>
+ <para><literal><filesystem_id config:type="integer">131</filesystem_id></literal></para>
</entry>
<entry>since 10.1 and SLES10 it's recommended to use partition_id instead.</entry>
</row>
@@ -317,7 +318,7 @@
<para>
instead of a partition number, you can tell autoyast to mount a partition by label, uuid, path or id which are the udev path and udev id (see /dev/disk/...)
</para>
- <para><screen><mountby config:type="symbol">label</mountby></screen></para>
+ <para><literal><mountby config:type="symbol">label</mountby></literal></para>
</entry>
<entry>see "label" and "uuid" documentation above</entry>
</row>
@@ -329,7 +330,7 @@
(see is_lvm_vg/is_evms_vg parameter in drive configuration) you
must specifiy the logical volume name here.
</para>
- <para><screen><lv_name>opt_lv</lv_name></screen></para>
+ <para><literal><lv_name>opt_lv</lv_name></literal></para>
</entry>
<entry></entry>
</row>
@@ -339,7 +340,7 @@
<para>
It's an integer that tells AutoYaST to do LVM striping. You can configure across how man devices you want to stripe
</para>
- <para><screen><stripes config:type="integer">2</stripes></screen></para>
+ <para><literal><stripes config:type="integer">2</stripes></literal></para>
</entry>
<entry></entry>
</row>
@@ -349,7 +350,7 @@
<para>
It's an integer that tells AutoYaST the size of each block in kb
</para>
- <para><screen><stripesize config:type="integer">4</stripesize></screen></para>
+ <para><literal><stripesize config:type="integer">4</stripesize></literal></para>
</entry>
<entry></entry>
</row>
@@ -361,7 +362,7 @@
you have to specify the name of the volume
group here.
</para>
- <para><screen><lvm_group>system</lvm_group></screen></para>
+ <para><literal><lvm_group>system</lvm_group></literal></para>
</entry>
<entry></entry>
</row>
@@ -372,7 +373,7 @@
if this physical partition is used by a volume group (EVMS), you have to specify the name of the volume
group here.
</para>
- <para><screen><evms_group>system</evms_group></screen></para>
+ <para><literal><evms_group>system</evms_group></literal></para>
</entry>
<entry></entry>
</row>
@@ -382,7 +383,7 @@
<para>
this physical volume is part of a RAID and the name of the raid is specified here.
</para>
- <para><screen><raid_name>/dev/md0</raid_name></screen></para>
+ <para><literal><raid_name>/dev/md0</raid_name></literal></para>
</entry>
<entry></entry>
</row>
@@ -392,7 +393,7 @@
<para>
this physical volume is part of a RAID and the type of the raid is specified here..
</para>
- <para><screen><raid_type>raid1</raid_type></screen></para>
+ <para><literal><raid_type>raid1</raid_type></literal></para>
</entry>
<entry></entry>
</row>
@@ -402,7 +403,7 @@
<para>
special options for the raid are specified here. See below.
</para>
- <para><screen><raid_options>...</raid_options></screen></para>
+ <para><literal><raid_options>...</raid_options></literal></para>
</entry>
<entry></entry>
</row>
@@ -419,7 +420,7 @@
<emphasis>800M</emphasis>. <emphasis>max</emphasis> and <emphasis>auto</emphasis> don't
work as size here.
</para>
- <para><screen><resize config:type="boolean">false</resize></screen></para>
+ <para><literal><resize config:type="boolean">false</resize></literal></para>
</entry>
<entry>The resize only works with physical disks. Not with LVM/EVMS volumes.</entry>
</row>
@@ -447,7 +448,7 @@
<entry>
<para>
</para>
- <para><screen><chunk_size>4</chunk_size></screen></para>
+ <para><literal><chunk_size>4</chunk_size></literal></para>
</entry>
<entry></entry>
</row>
@@ -457,7 +458,7 @@
<para>
possible values are: left_asymmetric, left_symmetric, right_asymmetric, right_symmetric and since SLES11 SP2 and openSUSE 12.1 you can use parity_first, parity_last, left_asymmetric_6, left_symmetric_6, right_asymmetric_6, right_symmetric_6, parity_first_6, n2, o2, f2, n3, o3, f3 for RAID6 and RAID10
</para>
- <para><screen><parity_algorithm>left_asymmetric</parity_algorithm></screen></para>
+ <para><literal><parity_algorithm>left_asymmetric</parity_algorithm></literal></para>
</entry>
<entry></entry>
</row>
@@ -467,7 +468,7 @@
<para>
possible values are raid0,raid1 and raid5
</para>
- <para><screen><raid_type>raid1</raid_type></screen></para>
+ <para><literal><raid_type>raid1</raid_type></literal></para>
</entry>
<entry>the default is raid1</entry>
</row>
@@ -650,15 +651,15 @@
</para>
<para>
if you go into the "drive" section, you can add
+ </para>
<screen>
<![CDATA[
<initialize config:type="boolean">true</initialize>
]]>
</screen>
- which tells Autoyast to delete the partition table before it starts to analyse the
+<para> which tells Autoyast to delete the partition table before it starts to analyse the
actual partitioning and calculates it's partition plan. Of course this means, that you
- can't keep any of your existing partitions.
- </para>
+ can't keep any of your existing partitions.</para>
</section>
<section>
<title>Mount Options</title>
Modified: branches/tmp/ke/autoinstallation/doc/xml/ScriptsSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/ScriptsSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/ScriptsSection.xml Tue Oct 25 17:22:51 2011
@@ -30,7 +30,7 @@
<remark>FIXME: Is this a title?</remark>
<para>All scripts have to be in the <scritps> section.</para>
- <para>
+
<itemizedlist>
<listitem><para><emphasis>pre-scripts</emphasis> (very early, before anything else really happened)</para></listitem>
<listitem><para><emphasis>postpartitioning-scripts</emphasis> (after partitioning and mounting to /mnt but before RPM installation - since openSUSE 11.2)</para></listitem>
@@ -38,7 +38,7 @@
<listitem><para><emphasis>post-scripts</emphasis> (during the first boot of the installed system, no services running)</para></listitem>
<listitem><para><emphasis>init-scripts</emphasis> (during the first boot of the installed system, all servies up and running)</para></listitem>
</itemizedlist>
- </para>
+
<section id="pre-install.scripts">
<title>Pre-Install Scripts</title>
<para>
@@ -67,7 +67,6 @@
<para>
The following elements must be between the <scripts><pre-scripts config:type="list"><script> ... </script></pre-scripts>...</scripts> tags
</para>
- <para>
<table frame='top'>
<title>pre script XML representation</title>
<tgroup cols="3">
@@ -81,72 +80,72 @@
<tbody>
<row>
<entry>location</entry>
- <entry>you can define a location from where the script gets fetched.
+ <entry><para>you can define a location from where the script gets fetched.
Locations can be the same like for the profile (http,ftp,nfs,...).
- <para><screen><location>http://10.10.0.1/myPreScript.sh</location></screen></para></entry>
+ </para><screen><location>http://10.10.0.1/myPreScript.sh</location></screen></entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>source</entry>
- <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
- to put the whole shell script into the XML profile, look at the location parameter.
+ <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
+ to put the whole shell script into the XML profile, look at the location parameter.</para>
- <para><screen><source>
+ <screen><source>
<![CDATA[
echo "Testing the pre script" > /tmp/pre-script_out.txt
]]>
-</source></screen></para></entry>
+</source></screen></entry>
<entry>Either <location> or <source> must be defined</entry>
</row>
<row>
<entry>interpreter</entry>
- <entry>the interpreter that must be used for the script. Supported options are shell and perl.
- <para><screen><interpreter>perl</interpreter></screen></para></entry>
+ <entry><para>the interpreter that must be used for the script. Supported options are shell and perl.
+ </para><screen><interpreter>perl</interpreter></screen></entry>
<entry>optional (default is shell)</entry>
</row>
<row>
<entry>filename</entry>
- <entry>the filename of the script. It will be stored in a temporary directory under /tmp/...
- <para><screen><filename>myPreScript5.sh</filename></screen></para></entry>
+ <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/...
+ </para><screen><filename>myPreScript5.sh</filename></screen></entry>
<entry>optional. The default is the type of the script (pre-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry>
</row>
<row>
<entry>feedback</entry>
- <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
+ <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so
no confirmation is needed.
- <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry>
+ </para><screen><feedback config:type="boolean">true</feedback></screen></entry>
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>feedback_type</entry>
- <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
- <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ </para><screen><feedback_type>warning</feedback_type></screen></entry>
<entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
</row>
<row>
<entry>debug</entry>
- <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
+ <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
- <para><screen><debug config:type="boolean">true</debug></screen></para></entry>
+ </para><screen><debug config:type="boolean">true</debug></screen></entry>
<entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>notification</entry>
- <entry>This text will be shown in a popup for the time the script is running in the background
- <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry>
+ <entry><para>This text will be shown in a popup for the time the script is running in the background
+ </para><screen><notification>Please wait while script is running ...</notification></screen></entry>
<entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry>
</row>
<row>
<entry>rerun</entry>
- <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
- <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry>
+ <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
+ </para><screen><rerun config:type="boolean">true</rerun></screen></entry>
<entry>optional. The default is false which makes scripts only run one time</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
+
</section>
<section id="postpartitioning-install.scripts">
@@ -161,7 +160,7 @@
<para>
The following elements must be between the <scripts><postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-scripts>...</scripts> tags
</para>
- <para>
+
<table frame='top'>
<title>postpartitioning script XML representation</title>
<tgroup cols="3">
@@ -175,72 +174,71 @@
<tbody>
<row>
<entry>location</entry>
- <entry>you can define a location from where the script gets fetched.
+ <entry><para>you can define a location from where the script gets fetched.
Locations can be the same like for the profile (http,ftp,nfs,...).
- <para><screen><location>http://10.10.0.1/myScript.sh</location></screen></para></entry>
+ </para><screen><location>http://10.10.0.1/myScript.sh</location></screen></entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>source</entry>
- <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
+ <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
to put the whole shell script into the XML profile, look at the location parameter.
- <para><screen><source>
+ </para><screen><source>
<![CDATA[
echo "Testing postpart script" > /mnt/postpart_test.txt
]]>
-</source></screen></para></entry>
+</source></screen></entry>
<entry>Either <location> or <source> must be defined</entry>
</row>
<row>
<entry>interpreter</entry>
- <entry>the interpreter that must be used for the script. Supported options are shell and perl.
- <para><screen><interpreter>perl</interpreter></screen></para></entry>
+ <entry><para>the interpreter that must be used for the script. Supported options are shell and perl.
+ </para><screen><interpreter>perl</interpreter></screen></entry>
<entry>optional (default is shell)</entry>
</row>
<row>
<entry>filename</entry>
- <entry>the filename of the script. It will be stored in a temporary directory under /tmp/...
- <para><screen><filename>myScript5.sh</filename></screen></para></entry>
+ <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/...
+ </para><screen><filename>myScript5.sh</filename></screen></entry>
<entry>optional. The default is the type of the script (postpartitioning-scripts in this case). If you have more than one script, you should set the filename to a reasonable value</entry>
</row>
<row>
<entry>feedback</entry>
- <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
+ <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so
no confirmation is needed.
- <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry>
+ </para><screen><feedback config:type="boolean">true</feedback></screen></entry>
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>feedback_type</entry>
- <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
- <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ </para><screen><feedback_type>warning</feedback_type></screen></entry>
<entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
</row>
<row>
<entry>debug</entry>
- <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
+ <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
- <para><screen><debug config:type="boolean">true</debug></screen></para></entry>
+ </para><screen><debug config:type="boolean">true</debug></screen></entry>
<entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>notification</entry>
- <entry>This text will be shown in a popup for the time the script is running in the background
- <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry>
+ <entry><para>This text will be shown in a popup for the time the script is running in the background
+ </para><screen><notification>Please wait while script is running ...</notification></screen></entry>
<entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry>
</row>
<row>
<entry>rerun</entry>
- <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
- <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry>
+ <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
+ </para><screen><rerun config:type="boolean">true</rerun></screen></entry>
<entry>optional. The default is false which makes scripts only run one time</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
</section>
@@ -257,7 +255,7 @@
<para>
The following elements must be between the <scripts><chroot-scripts config:type="list"><script> ... </script></chroot-scripts>...</scripts> tags
</para>
- <para>
+
<table frame='top'>
<title>chroot script XML representation</title>
<tgroup cols="3">
@@ -271,79 +269,79 @@
<tbody>
<row>
<entry>location</entry>
- <entry>you can define a location from where the script gets fetched.
+ <entry><para>you can define a location from where the script gets fetched.
Locations can be the same like for the profile (http,ftp,nfs,...).
- <para>
+ </para>
<screen><location>http://10.10.0.1/myChrootScript.sh</location></screen>
- </para></entry>
+ </entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>source</entry>
- <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
+ <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
to put the whole shell script into the XML profile, look at the location parameter.
- <para><screen><source>
+ </para><screen><source>
<![CDATA[
echo "Testing the chroot script" > /tmp/chroot_out.txt
]]>
-</source></screen></para></entry>
+</source></screen></entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>chrooted</entry>
- <entry>this value can be true or false. "False" means that the installed system is still mounted at "/mnt" and no chrooting has happened till now. The bootloader is not installed too at that stage. "True" means, we did a chroot into /mnt, so we are now in the installed system. The bootloader is installed and if you want to change anything in the installed system, you don't have to use the "/mnt/" prefix anymore.
- <para><screen><chrooted config:type="boolean">true</chrooted></screen></para></entry>
+ <entry><para>this value can be true or false. "False" means that the installed system is still mounted at "/mnt" and no chrooting has happened till now. The bootloader is not installed too at that stage. "True" means, we did a chroot into /mnt, so we are now in the installed system. The bootloader is installed and if you want to change anything in the installed system, you don't have to use the "/mnt/" prefix anymore.
+ </para><screen><chrooted config:type="boolean">true</chrooted></screen></entry>
<entry>optional (the default is false)</entry>
</row>
<row>
<entry>interpreter</entry>
- <entry>the interpreter that must be used for the script. Supported options are shell and perl.and if you are in a chrooted=true condition, you can use python too if it's installed.
- <para><screen><interpreter>perl</interpreter></screen></para></entry>
+ <entry><para>the interpreter that must be used for the script. Supported options are shell and perl.and if you are in a chrooted=true condition, you can use python too if it's installed.
+ </para><screen><interpreter>perl</interpreter></screen></entry>
<entry>optional (default is shell)</entry>
</row>
<row>
<entry>filename</entry>
- <entry>the filename of the script. It will be stored in a temporary directory under /tmp/...
- <para><screen><filename>myPreScript5.sh</filename></screen></para></entry>
+ <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/...
+ </para><screen><filename>myPreScript5.sh</filename></screen></entry>
<entry>optional. The default is the type of the script (chroot-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry>
</row>
<row>
<entry>feedback</entry>
- <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
+ <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so
no confirmation is needed.
- <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry>
+ </para><screen><feedback config:type="boolean">true</feedback></screen></entry>
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>feedback_type</entry>
- <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
- <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ </para><screen><feedback_type>warning</feedback_type></screen></entry>
<entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
</row>
<row>
<entry>debug</entry>
- <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
+ <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
- <para><screen><debug config:type="boolean">true</debug></screen></para></entry>
+ </para><screen><debug config:type="boolean">true</debug></screen></entry>
<entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>notification</entry>
- <entry>This text will be shown in a popup for the time the script is running in the background
- <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry>
+ <entry><para>This text will be shown in a popup for the time the script is running in the background
+ </para><screen><notification>Please wait while script is running ...</notification></screen></entry>
<entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry>
</row>
<row>
<entry>rerun</entry>
- <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
- <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry>
+ <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
+ </para><screen><rerun config:type="boolean">true</rerun></screen></entry>
<entry>optional. The default is false which makes scripts only run one time</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
+
</section>
<section id="post-insall.scripts">
<title>Post-Install Scripts</title>
@@ -360,7 +358,7 @@
<para>
The following elements must be between the <scripts><post-scripts config:type="list"><script> ... </script></post-scripts>...</scripts> tags
</para>
- <para>
+
<table frame='top'>
<title>post script XML representation</title>
<tgroup cols="3">
@@ -374,80 +372,80 @@
<tbody>
<row>
<entry>location</entry>
- <entry>you can define a location from where the script gets fetched.
+ <entry><para>you can define a location from where the script gets fetched.
Locations can be the same like for the profile (http,ftp,nfs,...) but then you need a running network interface of course
- <para>
+ </para>
<screen><location>http://10.10.0.1/myPostScript.sh</location></screen>
- </para></entry>
+ </entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>source</entry>
- <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
+ <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
to put the whole shell script into the XML profile, look at the location parameter.
- <para><screen><source>
+ </para><screen><source>
<![CDATA[
echo "Testing the chroot script" > /tmp/chroot_out.txt
]]>
-</source></screen></para></entry>
+</source></screen></entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>network_needed</entry>
<!-- FIXME: double check that. I'm very unsure if this is correct -->
- <entry>this value can be true or false. On "false" the script will run after the yast modules like the user configuration and everything else are done. The network is configured but still not up and running. With this value on "true", the script runs before(!) all yast modules are configured. So there is no local user and no network is configured but the installation network is still up and running (of course only if you did a network installation).
- <para><screen><network_needed config:type="boolean">true</network_needed></screen></para></entry>
+ <entry><para>this value can be true or false. On "false" the script will run after the yast modules like the user configuration and everything else are done. The network is configured but still not up and running. With this value on "true", the script runs before(!) all yast modules are configured. So there is no local user and no network is configured but the installation network is still up and running (of course only if you did a network installation).
+ </para><screen><network_needed config:type="boolean">true</network_needed></screen></entry>
<entry>optional (the default is false)</entry>
</row>
<row>
<entry>interpreter</entry>
- <entry>the interpreter that must be used for the script. Supported options are shell, perl and python if it's installed.
- <para><screen><interpreter>perl</interpreter></screen></para></entry>
+ <entry><para>the interpreter that must be used for the script. Supported options are shell, perl and python if it's installed.
+ </para><screen><interpreter>perl</interpreter></screen></entry>
<entry>optional (default is shell)</entry>
</row>
<row>
<entry>filename</entry>
- <entry>the filename of the script. It will be stored in a temporary directory under /tmp/...
- <para><screen><filename>myPostScript5.sh</filename></screen></para></entry>
+ <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/...
+ </para><screen><filename>myPostScript5.sh</filename></screen></entry>
<entry>optional. The default is the type of the script (post-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry>
</row>
<row>
<entry>feedback</entry>
- <entry>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
+ <entry><para>if this boolean is true, stdout and stderr of the script will be shown in a popup that the
user has to confirm via ok-button. If stdout and stderr are empty, no popup is shown and so
no confirmation is needed.
- <para><screen><feedback config:type="boolean">true</feedback></screen></para></entry>
+ </para><screen><feedback config:type="boolean">true</feedback></screen></entry>
<entry>optional. The default is false. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>feedback_type</entry>
- <entry>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
- <para><screen><feedback_type>warning</feedback_type></screen></para></entry>
+ <entry><para>this can be "message", "warning", "error" and you can control the timeout of those popups with the <report> section.
+ </para><screen><feedback_type>warning</feedback_type></screen></entry>
<entry>optional. If missing, an always blocking popup is used. This option was invited with openSUSE 11.2 (not SLES11)</entry>
</row>
<row>
<entry>debug</entry>
- <entry>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
+ <entry><para>if this is true, every single line of a shell script is logged. Perl scripts are run with warnings
turned on.
- <para><screen><debug config:type="boolean">true</debug></screen></para></entry>
+ </para><screen><debug config:type="boolean">true</debug></screen></entry>
<entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry>
</row>
<row>
<entry>notification</entry>
- <entry>This text will be shown in a popup for the time the script is running in the background
- <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry>
+ <entry><para>This text will be shown in a popup for the time the script is running in the background
+ </para><screen><notification>Please wait while script is running ...</notification></screen></entry>
<entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3/SLES11 SP2 (not SLES10)</entry>
</row>
<row>
<entry>rerun</entry>
- <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
- <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry>
+ <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
+ </para><screen><rerun config:type="boolean">true</rerun></screen></entry>
<entry>optional. The default is false which makes scripts only run one time</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
+
</section>
<section id="init.scripts">
<title>Init Scripts</title>
@@ -465,7 +463,7 @@
<para>
The following elements must be between the <scripts><init-scripts config:type="list"><script> ... </script></init-scripts>...</scripts> tags
</para>
- <para>
+
<table frame='top'>
<title>init script XML representation</title>
<tgroup cols="3">
@@ -479,40 +477,40 @@
<tbody>
<row>
<entry>location</entry>
- <entry>you can define a location from where the script gets fetched.
+ <entry><para>you can define a location from where the script gets fetched.
Locations can be the same like for the profile (http,ftp,nfs,...) but then you need a running network interface of course
- <para>
+ </para>
<screen><location>http://10.10.0.1/myInitScript.sh</location></screen>
- </para></entry>
+ </entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>source</entry>
- <entry>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
+ <entry><para>the script itself. The source code of the script if you want so. Encapsulated in a CDATA tag. If you don't want
to put the whole shell script into the XML profile, look at the location parameter.
- <para><screen><source>
+ </para><screen><source>
<![CDATA[
echo "Testing the init script" > /tmp/init_out.txt
]]>
-</source></screen></para></entry>
+</source></screen></entry>
<entry>either <location> or <source> must be defined</entry>
</row>
<row>
<entry>filename</entry>
- <entry>the filename of the script. It will be stored in a temporary directory under /tmp/...
- <para><screen><filename>mynitScript5.sh</filename></screen></para></entry>
+ <entry><para>the filename of the script. It will be stored in a temporary directory under /tmp/...
+ </para><screen><filename>mynitScript5.sh</filename></screen></entry>
<entry>optional. The default is the type of the script (init-scripts) in this case. If you have more than one script, you should set the filename to a reasonable value</entry>
</row>
<row>
<entry>rerun</entry>
- <entry>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
- <para><screen><rerun config:type="boolean">true</rerun></screen></para></entry>
+ <entry><para>a script is only run once. So even if you use ayast_setup to run a XML file multiple times, the script is only run once. You can change that with this boolean.
+ </para><screen><rerun config:type="boolean">true</rerun></screen></entry>
<entry>optional. The default is false which makes scripts only run one time</entry>
</row>
</tbody>
</tgroup>
</table>
- </para>
+
<para>
When added to the control file manually, the
Modified: branches/tmp/ke/autoinstallation/doc/xml/SoftwareSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/SoftwareSection.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/SoftwareSection.xml Tue Oct 25 17:22:51 2011
@@ -133,18 +133,22 @@
The <emphasis>yast/order</emphasis> and <emphasis>yast/instorder</emphasis> is no longer supported. Neither
by AutoYaST nor by YaST. To add own RPMs to an installation source (that includes add-on products like the
SDK) you have to add a file <emphasis>add_on_products</emphasis> to the CD1 of the main product.
+ </para>
<screen>
media_url [path_on_media [product_1 [product_2 [....]]]
</screen>
+<para>
media_url is URL of the media itself
path_on_media is path of the catalog on the media. If not present, / (root) is assumed
product_1 and following are the names for products, which should be marked for installation. If no product is mentioned, all products found on the media are selected for installation.
For example:
- <screen>
+</para><screen>
http://192.168.66.6/SLES10/sdk/CD1
http://192.168.66.6/SLES10/CD1/updates
</screen>
- Besides that <emphasis>add_on_products</emphasis> file, you can use the autoyast profile to specify add-on products. For example:
+ <para>
+ Besides that <emphasis>add_on_products</emphasis> file, you can use the autoyast profile to specify add-on products. For example:
+ </para>
<screen>
<add-on>
<add_on_products config:type="list">
@@ -158,7 +162,8 @@
</add_on_products>
</add-on>
</screen>
- With that entry in the autoyast profile, the <emphasis>add_on_products</emphasis> file is not necessary.
+ <para>
+ With that entry in the autoyast profile, the <emphasis>add_on_products</emphasis> file is not necessary.
Since openSUSE 11.0 AutoYaST can ask the user to make the add-on available intead of reporting a timed out error when the add-on can't be found at the given location. Set ask_on_error to true for that (the default is false).
Your add-on can be on a different CD/DVD than the installation source then.
</para>
@@ -187,43 +192,43 @@
<tbody>
<row>
<entry>accept_unsigned_file</entry>
- <entry>the installer will accept unsigned files like the content file
- <para><screen><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></screen></para>
+ <entry><para>the installer will accept unsigned files like the content file</para>
+ <para><literal><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></literal></para>
</entry>
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
<row>
<entry>accept_file_without_checksum</entry>
- <entry>the installer will accept files without a checksum in the content file
- <para><screen><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></screen></para>
+ <entry><para>the installer will accept files without a checksum in the content file</para>
+ <para><literal><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></literal></para>
</entry>
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
<row>
<entry>accept_verification_failed</entry>
- <entry>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed.
- <para><screen><accept_verification_failed config:type="boolean">true</accept_verification_failed></screen></para>
+ <entry><para>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed.</para>
+ <para><literal><accept_verification_failed config:type="boolean">true</accept_verification_failed></literal></para>
</entry>
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
<row>
<entry>accept_unknown_gpg_key</entry>
- <entry>the installer will accept new gpg keys on the installation source that are used to sign the content file for example
- <para><screen><accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key></screen></para>
+ <entry><para>the installer will accept new gpg keys on the installation source that are used to sign the content file for example</para>
+ <para><literal><accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key></literal></para>
</entry>
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
<row>
<entry>accept_non_trusted_gpg_key</entry>
- <entry>This basically means, we know the key, but it is not trusted
- <para><screen><accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key></screen></para>
+ <entry><para>This basically means, we know the key, but it is not trusted</para>
+ <para><literal><accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key></literal></para>
</entry>
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
<row>
<entry>import_gpg_key</entry>
- <entry>the installer will accept and import new gpg keys on the installation source in it's database.
- <para><screen><import_gpg_key config:type="boolean">true</import_gpg_key></screen></para>
+ <entry><para>the installer will accept and import new gpg keys on the installation source in it's database.</para>
+ <para><literal><import_gpg_key config:type="boolean">true</import_gpg_key></literal></para>
</entry>
<entry>optional. If left out, autoyast lets yast decide what to do</entry>
</row>
@@ -248,64 +253,64 @@
<tbody>
<row>
<entry>accept_unsigned_file</entry>
- <entry>the installer will accept unsigned files like the content file for this add-on product
- <para><screen><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></screen></para>
+ <entry><para>the installer will accept unsigned files like the content file for this add-on product</para>
+ <para><literal><accept_unsigned_file config:type="boolean">true</accept_unsigned_file></literal></para>
</entry>
<entry>optional. If left out, the global signature-handing in the <general> section is used.</entry>
</row>
<row>
<entry>accept_file_without_checksum</entry>
- <entry>the installer will accept files without a checksum in the content file for this add-on
- <para><screen><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></screen></para>
+ <entry><para>the installer will accept files without a checksum in the content file for this add-on</para>
+ <para><literal><accept_file_without_checksum config:type="boolean">true</accept_file_without_checksum></literal></para>
</entry>
<entry>optional. If left out, the global signature-handing in the <general> section is used.</entry>
</row>
<row>
<entry>accept_verification_failed</entry>
- <entry>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed.
- <para><screen><accept_verification_failed config:type="boolean">true</accept_verification_failed></screen></para>
+ <entry><para>the installer will accept files where the verification of the signature failed. So the file was signed but the check failed.</para>
+ <para><literal><accept_verification_failed config:type="boolean">true</accept_verification_failed></literal></para>
</entry>
<entry>optional. If left out, the global signature-handing in the <general> section is used.</entry>
</row>
<row>
<entry>accept_unknown_gpg_key</entry>
- <entry>the installer will accept new gpg keys on the installation source that are used to sign the content file for example
- <para><screen>
+ <entry><para>the installer will accept new gpg keys on the installation source that are used to sign the content file for example</para>
+ <screen>
<accept_unknown_gpg_key>
<all config:type="boolean">false</all>
<keys config:type="list">
<keyid>3B3011B76B9D6523</keyid>
</keys>
</accept_unknown_gpg_key>
- </screen></para>
+ </screen>
</entry>
<entry>optional. If left out, the global signature-handing in the <general> section is used.</entry>
</row>
<row>
<entry>accept_non_trusted_gpg_key</entry>
- <entry>This basically means, we know the key, but it is not trusted
- <para><screen>
+ <entry><para>This basically means, we know the key, but it is not trusted</para>
+ <screen>
<accept_non_trusted_gpg_key>
<all config:type="boolean">false</all>
<keys config:type="list">
<keyid>3B3011B76B9D6523</keyid>
</keys>
</accept_non_trusted_gpg_key>
-</screen></para>
+</screen>
</entry>
<entry>optional. If left out, the global signature-handing in the <general> section is used.</entry>
</row>
<row>
<entry>import_gpg_key</entry>
- <entry>the installer will accept and import new gpg keys on the installation source in it's database.
- <para><screen>
+ <entry><para>the installer will accept and import new gpg keys on the installation source in it's database.</para>
+ <screen>
<import_gpg_key>
<all config:type="boolean">false</all>
<keys config:type="list">
<keyid>3B3011B76B9D6523</keyid>
</keys>
</import_gpg_key>
- </screen></para>
+ </screen>
</entry>
<entry>optional. If left out, the global signature-handing in the <general> section is used.</entry>
</row>
Modified: branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/ke/autoinstallation/doc/x…
==============================================================================
--- branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml (original)
+++ branches/tmp/ke/autoinstallation/doc/xml/autoyast.xml Tue Oct 25 17:22:51 2011
@@ -96,15 +96,3 @@
&appendix-linuxrc;
&Elements;
</book>
-
-
-
-
-
-
-
-
-
-
-
-
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66579 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp yast2-storage.spec.in
by fehr@svn2.opensuse.org 25 Oct '11
by fehr@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: fehr
Date: Tue Oct 25 16:32:12 2011
New Revision: 66579
URL: http://svn.opensuse.org/viewcvs/yast?rev=66579&view=rev
Log:
- version 2.21.11
- add function IsDeviceOnNetwork to be used by Network module (bnc#726057)
Modified:
trunk/storage/VERSION
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/modules/Storage.ycp
trunk/storage/yast2-storage.spec.in
Modified: trunk/storage/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=66579&r1=665…
==============================================================================
--- trunk/storage/VERSION (original)
+++ trunk/storage/VERSION Tue Oct 25 16:32:12 2011
@@ -1 +1 @@
-2.21.10
+2.21.11
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch…
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Tue Oct 25 16:32:12 2011
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Oct 25 16:08:52 CEST 2011 - fehr(a)suse.de
+
+- version 2.21.11
+- add function IsDeviceOnNetwork to be used by Network module
+ (bnc#726057)
+
+-------------------------------------------------------------------
Mon Oct 24 14:11:58 CEST 2011 - fehr(a)suse.de
- fix missing proposal for /home (bnc#725577)
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor…
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Tue Oct 25 16:32:12 2011
@@ -510,6 +510,40 @@
return LibStorage::StorageInterface::getIgnoreFstab(sint, device, val) == 0;
}
+symbol toSymbol( map<string,any> conv, integer val )
+ {
+ return( conv["m",val]:(conv["def_sym"]:`invalid_conv_map) );
+ }
+
+integer fromSymbol( map<string,any> conv, symbol val )
+ {
+ integer ret = conv["def_int"]:-1;
+ foreach( integer i, symbol s, conv["m"]:$[],
+ ``{
+ if( s==val )
+ ret = i;
+ });
+ return( ret );
+ }
+
+global boolean GetContVolInfo(string device, map<string, any>& info)
+ {
+ any tmp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo");
+ if (LibStorage::StorageInterface::getContVolInfo(sint, device, tmp) != 0)
+ return false;
+
+ info = $[ "ctype" : toSymbol(conv_ctype, LibStorage::ContVolInfo::swig_ctype_get(tmp)),
+ "cname" : LibStorage::ContVolInfo::swig_cname_get(tmp),
+ "cdevice" : LibStorage::ContVolInfo::swig_cdevice_get(tmp),
+ "vname" : LibStorage::ContVolInfo::swig_vname_get(tmp),
+ "vdevice" : LibStorage::ContVolInfo::swig_vdevice_get(tmp),
+ "num" : LibStorage::ContVolInfo::swig_num_get(tmp) ];
+
+ y2milestone("GetContVolInfo device:%1 info:%2", device, info);
+ return true;
+ }
+
+
global define map<string,map> GetTargetMap();
global define void SetTargetMap( map<string,map> target );
@@ -519,8 +553,9 @@
string key );
-define list<map> GetDiskPartitionTg( string device, map<string,map> tg )
+define list<map> GetDiskPartitionTg( string inpdev, map<string,map> tg )
``{
+ string device = inpdev;
list<map> ret = [];
integer dlen = 0;
boolean as_string = false;
@@ -740,6 +775,23 @@
{
tmp["nr"] = "";
}
+ if( size(tg)>0 && !haskey( tg, tmp["disk"]:"" ))
+ {
+ y2milestone( "GetDiskPartitionTg tmp:%1", tmp );
+ map<string,any> r = $[];
+ if( GetContVolInfo( inpdev, r ))
+ {
+ y2milestone( "GetDiskPartitionTg rtmp:%1", r );
+ if( haskey( tg, r["cdevice"]:"" ))
+ {
+ tmp["disk"] = r["cdevice"]:"";
+ if( r["num"]:-1 != -1 )
+ tmp["nr"] = r["num"]:-1;
+ else
+ tmp["nr"] = r["vname"]:"";
+ }
+ }
+ }
ret = [ tmp ];
}
else
@@ -1188,22 +1240,6 @@
return( ret );
}
-symbol toSymbol( map<string,any> conv, integer val )
- {
- return( conv["m",val]:(conv["def_sym"]:`invalid_conv_map) );
- }
-
-integer fromSymbol( map<string,any> conv, symbol val )
- {
- integer ret = conv["def_int"]:-1;
- foreach( integer i, symbol s, conv["m"]:$[],
- ``{
- if( s==val )
- ret = i;
- });
- return( ret );
- }
-
global define boolean CheckBackupState( string who )
{
y2milestone( "CheckBackupStates who:%1", who );
@@ -1849,7 +1885,7 @@
}
else
{
- if( haskey( mp, k ));
+ if( haskey( mp, k ))
{
y2milestone( "HandleBtrfsSimpleVolumes remove key %1", k );
tg = DelPartitionData( tg, p["device"]:"", k );
@@ -2227,23 +2263,6 @@
}
- global boolean GetContVolInfo(string device, map<string, any>& info)
- {
- any tmp = LibStorage::ContVolInfo::new("LibStorage::ContVolInfo");
- if (LibStorage::StorageInterface::getContVolInfo(sint, device, tmp) != 0)
- return false;
-
- info = $[ "ctype" : toSymbol(conv_ctype, LibStorage::ContVolInfo::swig_ctype_get(tmp)),
- "cname" : LibStorage::ContVolInfo::swig_cname_get(tmp),
- "cdevice" : LibStorage::ContVolInfo::swig_cdevice_get(tmp),
- "vname" : LibStorage::ContVolInfo::swig_vname_get(tmp),
- "vdevice" : LibStorage::ContVolInfo::swig_vdevice_get(tmp) ];
-
- y2milestone("GetContVolInfo device:%1 info:%2", device, info);
- return true;
- }
-
-
global boolean IsInstallationSource(string device)
{
if (part_insts == nil)
@@ -6080,4 +6099,88 @@
return( ret );
}
+list<string> GetUsedDisks( string device )
+ {
+ y2milestone( "GetUsedDisks device:%1", device );
+ list<string> ret = [];
+ map<string,map> tg = GetTargetMap();
+ map<string,any> info = $[];
+ if( GetContVolInfo(device, info))
+ {
+ y2milestone( "GetUsedDisks info:%1", info );
+ list<string> to_visit = [ device ];
+ list<string> visited_devs = [];
+ do
+ {
+ visited_devs = add( visited_devs, to_visit[0]:"" );
+ to_visit = remove( to_visit, 0 );
+ list<string> add_list = [];
+ if( info["ctype"]:`CT_UNKNOWN==`CT_DISK )
+ {
+ if( !contains( ret, info["cdevice"]:"" ))
+ ret = add( ret, info["cdevice"]:"" );
+ }
+ else if( info["ctype"]:`CT_UNKNOWN==`CT_BTRFS )
+ {
+ map bt = find( map p, tg["/dev/btrfs","partitions"]:[],
+ ``(contains( p["devices"]:[], info["vdevice"]:"" )));
+ y2milestone( "GetUsedDisks bt:%1", bt );
+ if( bt!=nil )
+ add_list = bt["devices"]:[];
+ }
+ else
+ {
+ add_list = tg[info["cdevice"]:"","devices"]:[];
+ }
+ if( size(add_list)>0 )
+ y2milestone( "GetUsedDisks add_list:%1", add_list );
+ foreach( string s, add_list,
+ ``{
+ if( !contains( visited_devs, s ) && !contains( to_visit, s ) &&
+ !contains( ret, s ))
+ to_visit = add( to_visit, s );
+ });
+ y2milestone( "GetUsedDisks to_visit:%1", to_visit );
+ while( size(to_visit)>0 && !GetContVolInfo(to_visit[0]:"", info))
+ {
+ visited_devs = add( visited_devs, to_visit[0]:"" );
+ to_visit = remove( to_visit, 0 );
+ }
+ if( size(to_visit)>0 )
+ y2milestone( "GetUsedDisks info:%1", info );
+ }
+ while( size(to_visit)>0 );
+ if( size(ret)>1 )
+ ret = sort( ret );
+ }
+ else if( substring(device,0,1)!="/" && search(device,":")>0 )
+ ret = [ "/dev/nfs" ];
+ y2milestone( "GetUsedDisks ret:%1", ret );
+ return( ret );
+ }
+
+global symbol IsDeviceOnNetwork( string device )
+ {
+ symbol ret = `no;
+ map<string,map> tg = GetTargetMap();
+
+ list<string> disks = GetUsedDisks( device );
+ if( disks[0]:""=="/dev/nfs" )
+ ret = `nfs;
+ else
+ {
+ foreach( string s, disks,
+ ``{
+ if( ret == `no )
+ {
+ y2milestone( "disk:%1 tarnsport:%2", s, tg[s,"transport"]:`unknown );
+ if( contains( [ `fcoe, `iscsi ], tg[s,"transport"]:`unknown ))
+ ret = tg[s,"transport"]:`unknown;
+ }
+ });
+ }
+ y2milestone( "IsDeviceOnNetwork device:%1 ret:%2", device, ret );
+ return( ret );
+ }
+
}
Modified: trunk/storage/yast2-storage.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re…
==============================================================================
--- trunk/storage/yast2-storage.spec.in (original)
+++ trunk/storage/yast2-storage.spec.in Tue Oct 25 16:32:12 2011
@@ -5,7 +5,7 @@
License: GPL-2.0+
BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
-BuildRequires: libstorage-devel >= 2.21.4 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.21.11 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings
Requires: yast2-perl-bindings perl = %{perl_version}
Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
[yast-commit] r66578 - /tags/branch-Code-11-SP2-2_17_118/storage/
by fehr@svn2.opensuse.org 25 Oct '11
by fehr@svn2.opensuse.org 25 Oct '11
25 Oct '11
Author: fehr
Date: Tue Oct 25 16:18:48 2011
New Revision: 66578
URL: http://svn.opensuse.org/viewcvs/yast?rev=66578&view=rev
Log:
Created tag branch-Code-11-SP2-2_17_118 for storage
Added:
tags/branch-Code-11-SP2-2_17_118/storage/ (props changed)
- copied from r66577, branches/SuSE-Code-11-SP2-Branch/storage/
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0