Author: ug
Date: Wed Mar 10 13:47:14 2010
New Revision: 61227
URL: http://svn.opensuse.org/viewcvs/yast?rev=61227&view=rev
Log:
docu and cleanup
Modified:
trunk/autoinstallation/doc/GeneralSection.xml
trunk/autoinstallation/doc/X11Section.xml
trunk/autoinstallation/package/autoyast2.changes
trunk/autoinstallation/src/dialogs/ask.ycp
trunk/autoinstallation/src/include/io.ycp
Modified: trunk/autoinstallation/doc/GeneralSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/GeneralSection.xml?rev=61227&r1=61226&r2=61227&view=diff
==============================================================================
--- trunk/autoinstallation/doc/GeneralSection.xml (original)
+++ trunk/autoinstallation/doc/GeneralSection.xml Wed Mar 10 13:47:14 2010
@@ -30,13 +30,9 @@
</para>
<example>
<title>General Options</title>
- <screen>
- http://www.w3.org/2001/XInclude"/>
- </screen>
- </example>
-
-
+ <para>
+ The mode section configures the behavior of AutoYaST when it comes to confirmation and rebooting. The following has to be in the <general><mode> section
+ </para>
<para>
By default, the auto-installation process has to be confirmed by the
user. The confirmation should be disabled if a fully unattended
@@ -64,6 +60,72 @@
uses the products default.
</para>
<para>
+ <table frame='top'>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Attribute</entry>
+ <entry>Values</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>confirm</entry>
+ <entry>if this boolean is set to "true" the installation stops at the confirmation screen (also called proposal screen) and has to be confirmed with the "install"-button.
+ <para><screen><confirm config:type="boolean">true</confirm></screen></para>
+ </entry>
+ <entry>optional. The default is true</entry>
+ </row>
+ <row>
+ <entry>halt</entry>
+ <entry>shut down the machine after the first stage. So if you turn it on again, the machine boots and the second stage of the autoinstallation starts
+ <para><screen><halt config:type="boolean">true</halt></screen></para>
+ </entry>
+ <entry>optional. The default is false</entry>
+ </row>
+ <row>
+ <entry>second_stage</entry>
+ <entry>this boolean configures if AutoYaST will run in the second stage too (after the partitioning, software and bootloader installation of the first stage). If you set this to false, a normal manual installation happens in the second stage.
+ <para><screen><second_stage config:type="boolean">true</second_stage></screen></para>
+ </entry>
+ <entry>optional. The default is true</entry>
+ </row>
+ <row>
+ <entry>final_reboot</entry>
+ <entry>if you set this to true, the machine will reboot at the very end of the installation (when everything is installed and configured at the end of the second stage)
+ <para><screen><final_reboot config:type="boolean">true</final_reboot></screen></para>
+ </entry>
+ <entry>optional. The default is false. It makes no sense to set this <emphasis>and</emphasis> final_halt to true. This options is available since openSUSE 11.0 and SLES11</entry>
+ </row>
+ <row>
+ <entry>final_halt</entry>
+ <entry>if you set this to true, the machine will shutdown at the very end of the installation (when everything is installed and configured at the end of the second stage)
+ <para><screen><final_halt config:type="boolean">true</final_halt></screen></para>
+ </entry>
+ <entry>optional. The default is false. It makes no sense to set this <emphasis>and</emphasis> final_reboot to true. This options is available since openSUSE 11.0 and SLES11</entry>
+ </row>
+ <row>
+ <entry>forceboot</entry>
+ <entry>Some openSUSE releases use kexec to avoid the reboot after the first stage. They immediately boot into the installed system. You can force a reboot with this
+ <para><screen><forceboot config:type="boolean">true</forceboot></screen></para>
+ </entry>
+ <entry>optional. The default is false.</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+
+
+<screen>
+ http://www.w3.org/2001/XInclude"/>
+ </screen>
+ </example>
+
+
+ <para>
AutoYaST in openSUSE 11.1 allows you to configure the proposal screen with the <proposals config:type="list">
option in the profile. All proposals that are listed in that section are shown in the proposal screen if you set the
<emphasis>confirm</emphasis> option to true.
Modified: trunk/autoinstallation/doc/X11Section.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/X11Section.xml?rev=61227&r1=61226&r2=61227&view=diff
==============================================================================
--- trunk/autoinstallation/doc/X11Section.xml (original)
+++ trunk/autoinstallation/doc/X11Section.xml Wed Mar 10 13:47:14 2010
@@ -20,13 +20,22 @@
<title>
Monitor and X11 Configuration
</title>
+ <note>
+ <para>
+ Since openSUSE 11.2 there is not AutoYaST client for X11 configuration anymore. You can still have the X11 section in your profile but
+ it will be ignored.
+ </para>
+ <para>
+ SLES11 SP1 still has a X11 client.
+ </para>
+ </note>
<para>
FIXME
</para>
<example>
<title>
- X11 and Monitor configuration
+ X11 and Monitor configuration (deprecated since openSUSE 11.2)
</title>
<screen>
http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=61227&r1=61226&r2=61227&view=diff
==============================================================================
--- trunk/autoinstallation/package/autoyast2.changes (original)
+++ trunk/autoinstallation/package/autoyast2.changes Wed Mar 10 13:47:14 2010
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Mar 10 13:46:57 CET 2010 - ug@suse.de
+
+- docu and cleanup
+
+-------------------------------------------------------------------
Fri Mar 5 11:04:13 CET 2010 - ug@suse.de
- new structure for documentation
Modified: trunk/autoinstallation/src/dialogs/ask.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask.ycp?rev=61227&r1=61226&r2=61227&view=diff
==============================================================================
--- trunk/autoinstallation/src/dialogs/ask.ycp (original)
+++ trunk/autoinstallation/src/dialogs/ask.ycp Wed Mar 10 13:47:14 2010
@@ -61,7 +61,6 @@
y2milestone("next_dialog file found. Set dialog to %1",jumpToDialog);
}
while( dialog_nr != -1 ) {
-// foreach( integer dialog_nr, sort( keys ), ``{
y2milestone("dialog_nr = %1",dialog_nr);
y2milestone("dialogCounter = %1",dialogCounter);
y2milestone("jumpToDialog %1",jumpToDialog);
@@ -306,7 +305,6 @@
dialogCounter = dialogCounter + 1;
dialog_nr = keys[dialogCounter]:-1;
}
-// });
y2milestone("E dialog_nr = %1",dialog_nr);
y2milestone("E dialogCounter = %1",dialogCounter);
y2milestone("E jumpToDialog %1",jumpToDialog);
Modified: trunk/autoinstallation/src/include/io.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.ycp?rev=61227&r1=61226&r2=61227&view=diff
==============================================================================
--- trunk/autoinstallation/src/include/io.ycp (original)
+++ trunk/autoinstallation/src/include/io.ycp Wed Mar 10 13:47:14 2010
@@ -73,7 +73,7 @@
if ( Scheme == "http" || Scheme == "https" )
{
- HTTP::easySSL( true );
+ HTTP::easySSL( true );
res = HTTP::Get(full_url, Localfile);
if (res["code"]:0 == 200)
{
@@ -123,52 +123,52 @@
if (SCR::Read(.target.size, Localfile) > 0 )
{
- GET_error = "";
- ok = true;
+ GET_error = "";
+ ok = true;
} else {
- GET_error = GET_error + sformat(_("Reading file on %1 failed.\n"), Path);
- y2milestone("Trying to find file on installation media: %1", Installation::boot ());
- if (Installation::boot () == "cd") {
- string cdrom = (string)SCR::Read (.etc.install_inf.Cdrom);
- string cdrom_device = "/dev/"+cdrom;
- string already_mounted = "grep "+cdrom_device+" /proc/mounts ;";
- map am = (map) SCR::Execute (.target.bash_output, already_mounted);
-
- if (am["exit"]:-1 == 0 && size (am["stdout"]:"") > 0) {
- y2warning ("%1 is already mounted, trying to bind mount...", cdrom_device);
- string cmd = "mount -v --bind `grep "+cdrom_device+" /proc/mounts |cut -f 2 -d \\ ` "+mount_point+";";
- map am1 = (map) SCR::Execute (.target.bash_output, cmd);
- if (am1["exit"]:-1 == 0) {
- ok=true;
- } else {
- y2warning ("can't bind mount %1 failing...", cdrom_device);
- ok = false;
- }
+ GET_error = GET_error + sformat(_("Reading file on %1 failed.\n"), Path);
+ y2milestone("Trying to find file on installation media: %1", Installation::boot ());
+ if (Installation::boot () == "cd") {
+ string cdrom = (string)SCR::Read (.etc.install_inf.Cdrom);
+ string cdrom_device = "/dev/"+cdrom;
+ string already_mounted = "grep "+cdrom_device+" /proc/mounts ;";
+ map am = (map) SCR::Execute (.target.bash_output, already_mounted);
+
+ if (am["exit"]:-1 == 0 && size (am["stdout"]:"") > 0) {
+ y2warning ("%1 is already mounted, trying to bind mount...", cdrom_device);
+ string cmd = "mount -v --bind `grep "+cdrom_device+" /proc/mounts |cut -f 2 -d \\ ` "+mount_point+";";
+ map am1 = (map) SCR::Execute (.target.bash_output, cmd);
+ if (am1["exit"]:-1 == 0) {
+ ok=true;
+ } else {
+ y2warning ("can't bind mount %1 failing...", cdrom_device);
+ ok = false;
+ }
- } else {
- if (!(boolean)WFM::Execute(.local.mount, [cdrom_device, mount_point, Installation::mountlog] )) {
- // autoyast tried to mount the CD but had no success.
- GET_error = GET_error + sformat(_("Mounting %1 failed."), cdrom );
- y2warning("Mount failed");
- ok=false;
} else {
- ok=true;
+ if (!(boolean)WFM::Execute(.local.mount, [cdrom_device, mount_point, Installation::mountlog] )) {
+ // autoyast tried to mount the CD but had no success.
+ GET_error = GET_error + sformat(_("Mounting %1 failed."), cdrom );
+ y2warning("Mount failed");
+ ok=false;
+ } else {
+ ok=true;
+ }
}
- }
- if (ok) {
- string cpcmd = sformat("cp " + mount_point + "/%1 %2", Path , Localfile);
- y2milestone("Copy profile: %1", cpcmd);
- SCR::Execute(.target.bash, cpcmd);
- WFM::Execute(.local.umount, mount_point);
- if (SCR::Read(.target.size, Localfile) > 0 ) {
- GET_error = "";
- return (true);
+ if (ok) {
+ string cpcmd = sformat("cp " + mount_point + "/%1 %2", Path , Localfile);
+ y2milestone("Copy profile: %1", cpcmd);
+ SCR::Execute(.target.bash, cpcmd);
+ WFM::Execute(.local.umount, mount_point);
+ if (SCR::Read(.target.size, Localfile) > 0 ) {
+ GET_error = "";
+ return (true);
+ }
}
}
- }
- // autoyast tried to read a file but had no success.
- GET_error = GET_error + sformat(_("Reading a file on CD failed. Path: %1/%2."),mount_point,Path);
- ok = false;
+ // autoyast tried to read a file but had no success.
+ GET_error = GET_error + sformat(_("Reading a file on CD failed. Path: %1/%2."),mount_point,Path);
+ ok = false;
}
}
else if (Scheme == "nfs") // NFS
@@ -260,84 +260,84 @@
{
if ( Path != "")
{
- list<string> deviceList = [];
- if( Host == "" ) {
- list<map> disks = (Scheme == "device") ? (list<map>)SCR::Read(.probe.disk) : (list<map>)SCR::Read(.probe.usb);
- foreach( map m, disks, ``{
- if( Scheme == "usb" &&
- m["bus"]:"USB" != "SCSI" )
- continue;
- if( haskey( m, "dev_name") ) {
- integer i = 0;
- string dev = m["dev_name"]:"";
- deviceList = add( deviceList, substring( dev, 5 ) ); // not uncommon for USB sticks to have no partition
- do {
- i = i + 1;
- dev = m["dev_name"]:"" + sformat("%1",i);
- if( SCR::Read(.target.lstat, dev) != $[] )
- deviceList = add( deviceList, substring( dev, 5 ) );
- } while( SCR::Read(.target.lstat, dev) != $[] || i < 5 );
+ list<string> deviceList = [];
+ if( Host == "" ) {
+ list<map> disks = (Scheme == "device") ? (list<map>)SCR::Read(.probe.disk) : (list<map>)SCR::Read(.probe.usb);
+ foreach( map m, disks, ``{
+ if( Scheme == "usb" &&
+ m["bus"]:"USB" != "SCSI" )
+ continue;
+ if( haskey( m, "dev_name") ) {
+ integer i = 0;
+ string dev = m["dev_name"]:"";
+ deviceList = add( deviceList, substring( dev, 5 ) ); // not uncommon for USB sticks to have no partition
+ do {
+ i = i + 1;
+ dev = m["dev_name"]:"" + sformat("%1",i);
+ if( SCR::Read(.target.lstat, dev) != $[] )
+ deviceList = add( deviceList, substring( dev, 5 ) );
+ } while( SCR::Read(.target.lstat, dev) != $[] || i < 5 );
+ }
+ });
+ y2milestone("devices to look on: %1", deviceList);
+ } else {
+ /*
+ sometimes we have devices like /dev/cciss/c1d0p5
+ those "nested" devices will be catched here
+ as long as we find a directory where we expect a device,
+ we cut down the Path and enhance the Host (device name)
+ */
+ while( SCR::Read( .target.dir, "/dev/"+Host ) != nil ) {
+ y2milestone("nested device found");
+ list<string> l = splitstring( Path, "/" );
+ Host = Host + "/" + l[0]:"";
+ l = remove(l,0);
+ Path = mergestring(l,"/");
+ y2milestone("Host=%1 Path=%2",Host,Path);
}
- });
- y2milestone("devices to look on: %1", deviceList);
- } else {
- /*
- sometimes we have devices like /dev/cciss/c1d0p5
- those "nested" devices will be catched here
- as long as we find a directory where we expect a device,
- we cut down the Path and enhance the Host (device name)
- */
- while( SCR::Read( .target.dir, "/dev/"+Host ) != nil ) {
- y2milestone("nested device found");
- list<string> l = splitstring( Path, "/" );
- Host = Host + "/" + l[0]:"";
- l = remove(l,0);
- Path = mergestring(l,"/");
- y2milestone("Host=%1 Path=%2",Host,Path);
+ // catching nested devices done
+ deviceList = [ Host ];
}
- // catching nested devices done
- deviceList = [ Host ];
- }
- foreach( string Host, deviceList, ``{
- y2milestone("looking for profile on %1", Host);
- string mounts = (string)(SCR::Read (.target.string, "/proc/mounts"));
- list<string> mount_list = splitstring( mounts, "\n" );
- boolean already_mounted = false;
- foreach( string m, mount_list, ``{
- list<string> entries = splitstring( m, " " );
- if( entries[0]:"" == "/dev/"+Host ) {
- already_mounted = true;
- mount_point = entries[1]:"";
- break;
+ foreach( string Host, deviceList, ``{
+ y2milestone("looking for profile on %1", Host);
+ string mounts = (string)(SCR::Read (.target.string, "/proc/mounts"));
+ list<string> mount_list = splitstring( mounts, "\n" );
+ boolean already_mounted = false;
+ foreach( string m, mount_list, ``{
+ list<string> entries = splitstring( m, " " );
+ if( entries[0]:"" == "/dev/"+Host ) {
+ already_mounted = true;
+ mount_point = entries[1]:"";
+ break;
+ }
+ });
+ y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point);
+ if( ! already_mounted &&
+ !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host),
+ mount_point]) ) {
+ y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host));
+ GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host));
+ continue;
}
- });
- y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point);
- if( ! already_mounted &&
- !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host),
- mount_point]) ) {
- y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host));
- GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host));
- continue;
- }
- if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0 )
- {
- // autoyast tried to copy a file but that file can't be found
- GET_error = sformat(_("File %1 cannot be found"),mount_point + Path);
- y2milestone("file %1 can't be found", mount_point + Path);
- }
- else
- {
- GET_error = "";
- ok = true;
- y2milestone("found");
- }
- if( ! already_mounted )
- WFM::Execute(.local.umount, mount_point);
- if( ok == true )
- break;
- });
- }
+ if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0 )
+ {
+ // autoyast tried to copy a file but that file can't be found
+ GET_error = sformat(_("File %1 cannot be found"),mount_point + Path);
+ y2milestone("file %1 can't be found", mount_point + Path);
+ }
+ else
+ {
+ GET_error = "";
+ ok = true;
+ y2milestone("found");
+ }
+ if( ! already_mounted )
+ WFM::Execute(.local.umount, mount_point);
+ if( ok == true )
+ break;
+ });
+ }
}
else if (Scheme == "tftp") // Device
{
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
