July 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r49544 - /tags/stable-2_17_7/storage/
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 15:40:03 2008 New Revision: 49544 URL: http://svn.opensuse.org/viewcvs/yast?rev=49544&view=rev Log: Created tag stable-2_17_7 for storage Added: tags/stable-2_17_7/storage/ - copied from r49543, trunk/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] r49543 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/modules/Partitions.ycp
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 15:30:18 2008 New Revision: 49543 URL: http://svn.opensuse.org/viewcvs/yast?rev=49543&view=rev Log: - recognise NetBSD partitions (bnc #412244) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=49543&r1=495… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu Jul 31 15:30:18 2008 @@ -1 +1 @@ -2.17.6 +2.17.7 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 Thu Jul 31 15:30:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 31 15:29:12 CEST 2008 - aschnell(a)suse.de + +- recognise NetBSD partitions (bnc #412244) +- version 2.17.7 + +------------------------------------------------------------------- Wed Jul 30 09:57:59 CEST 2008 - aschnell(a)suse.de - fixed segmentation fault (bnc #405129) Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Thu Jul 31 15:30:18 2008 @@ -37,6 +37,7 @@ global integer fsid_gpt_msftres = 0x105; global integer fsid_freebsd = 0xa5; global integer fsid_openbsd = 0xa6; + global integer fsid_netbsd = 0xa9; global integer fsid_beos = 0xeb; global integer fsid_solaris = 0xbf; global integer fsid_root = fsid_native; @@ -658,6 +659,7 @@ if ( fs_id == 0xa0) return( "Hibernation"); if ( fs_id == 0xa5) return( "FreeBSD"); if ( fs_id == 0xa6) return( "OpenBSD"); + if ( fs_id == 0xa9) return( "NetBSD"); if ( fs_id == 0x102) return( "Apple_HFS"); if ( fs_id == 0x103) return( "EFI boot"); if ( fs_id == 0x104) return( "Service"); -- 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] r49542 - /trunk/storage/storage/src/modules/Partitions.ycp
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 15:23:24 2008 New Revision: 49542 URL: http://svn.opensuse.org/viewcvs/yast?rev=49542&view=rev Log: - removed obsolete function UseParted Modified: trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Thu Jul 31 15:23:24 2008 @@ -375,16 +375,6 @@ return( swap_size ); }; -global define boolean UseParted() - ``{ - boolean ret = true; -/* - if( Arch::i386 () || Arch::x86_64 () ) - ret = false; -*/ - y2milestone( "UseParted ret:%1", ret ); - return( ret ); - } global define boolean IsResizable( integer fsid ) ``{ -- 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] r49541 - /trunk/storage/yast2-storage.spec.in
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 14:45:57 2008 New Revision: 49541 URL: http://svn.opensuse.org/viewcvs/yast?rev=49541&view=rev Log: - adapted file list Modified: trunk/storage/yast2-storage.spec.in 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 Thu Jul 31 14:45:57 2008 @@ -46,8 +46,6 @@ # storage %dir @yncludedir@/partitioning @yncludedir@/partitioning/*.ycp -%dir @yncludedir@/storage -@yncludedir@/storage/*.ycp @clientdir@/inst_custom_part.ycp @clientdir@/inst_lvm_lv.ycp @clientdir@/inst_resize_ui.ycp -- 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] r49540 - in /trunk/storage/storage/src/modules: Makefile.am Storage.ycp StorageDevices.ycp routines.ycp
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 14:22:02 2008 New Revision: 49540 URL: http://svn.opensuse.org/viewcvs/yast?rev=49540&view=rev Log: - define GetDeviceName just onces Removed: trunk/storage/storage/src/modules/routines.ycp Modified: trunk/storage/storage/src/modules/Makefile.am trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageDevices.ycp Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Make… ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Thu Jul 31 14:22:02 2008 @@ -7,11 +7,6 @@ YCPC_LD_LIBRARY_PATH = ../../../libstorage/src/.libs YCPC_Y2DIR = ../../../libstorage/src/.libs -yncludedir = @yncludedir@/storage - -ynclude_DATA = \ - routines.ycp - module_DATA = \ Partitions.ycp \ FileSystems.ycp \ @@ -20,7 +15,7 @@ StorageControllers.ycp \ StorageDevices.ycp -EXTRA_DIST = $(module_DATA) $(ynclude_DATA) +EXTRA_DIST = $(module_DATA) include: mkdir include && ln -sf ../../include include/partitioning 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 Thu Jul 31 14:22:02 2008 @@ -173,9 +173,6 @@ string part_insts = ""; - /* - include "storage/routines.ycp"; - */ /** * Returns Device Name * Modified: trunk/storage/storage/src/modules/StorageDevices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageDevices.ycp (original) +++ trunk/storage/storage/src/modules/StorageDevices.ycp Thu Jul 31 14:22:02 2008 @@ -103,33 +103,6 @@ } - /** - * - #include "storage/routines.ycp"; - */ -global define string GetDeviceName( string disk, any partition ) - ``{ - string ret = disk; - - if( is( partition, integer ) ) - { - if( search( disk, "/dev/cciss/" )==0 || - search( disk, "/dev/ida/" )==0 || - search( disk, "/dev/ataraid/" )==0 || - search( disk, "/dev/etherd/" )==0 || - search( disk, "/dev/rd/" )==0 ) - { - ret = ret + "p"; - } - ret = ret + sformat( "%1", partition ); - } - else if( size( (string)partition )>0 ) - { - ret = ret + "/" + (string)partition; - } - return( ret ); - }; - global define list<map> AddNormalLinknames( list<map> cddrives ) ``{ map linknum = $[ "cdrom" : 0, -- 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] r49539 - /branches/tmp/aschnell/part-redesign/storage/src/inst_disk.ycp
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 11:43:00 2008 New Revision: 49539 URL: http://svn.opensuse.org/viewcvs/yast?rev=49539&view=rev Log: - removed obsolete sequencer stuff Modified: branches/tmp/aschnell/part-redesign/storage/src/inst_disk.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/inst_disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/inst_disk.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/inst_disk.ycp Thu Jul 31 11:43:00 2008 @@ -17,207 +17,68 @@ * Main file for disk configuration. Uses all other files. * */ - { + textdomain "storage"; -/*** - * <h3>Configuration of the disk</h3> - */ - y2milestone( "start disk"); + import "Wizard"; + import "Mode"; + import "Storage"; + import "StorageClients"; + -import "Arch"; -import "Wizard"; -import "Mode"; -import "Storage"; -import "StorageClients"; -import "Sequencer"; - -textdomain "storage"; - -include "partitioning/signatures.ycp"; -include "partitioning/custom_part_helptexts.ycp"; -include "partitioning/custom_part_dialogs.ycp"; -include "partitioning/custom_part_lib.ycp"; -include "partitioning/raid_lib.ycp"; -include "partitioning/raid_ui.ycp"; -include "partitioning/loop.ycp"; -include "partitioning/lvm_pv_lib.ycp"; -include "partitioning/partition_defines.ycp"; -include "partitioning/custom_part_check_generated.ycp"; + y2milestone("start inst_disk"); y2milestone( "PartMode %1 ProposalActive %2 ", Storage::GetPartMode(), Storage::GetPartProposalActive() ); if( !Storage::GetCustomDisplay() && Storage::GetPartMode() != "CUSTOM" && - Storage::GetPartMode() != "PROP_MODIFY" ) - return Storage::GetExitKey(); - - if( !Storage::CheckBackupState("disk")) - Storage::CreateTargetBackup("disk"); - - - boolean installation = Stage::initial (); - - y2milestone( " running in instsys %1", installation ); - - -define symbol InitSettings( boolean in ) - ``{ - return `next; + Storage::GetPartMode() != "PROP_MODIFY" ) + { + symbol ret = Storage::GetExitKey(); + y2milestone("end inst_disk ret:%1", ret); + return ret; } - map aliases = $[ - "RaidTypeWizard" : ``(ChooseRaidType(`wizard )), - "RaidDeviceWizard" : ``(RaidDevices(`wizard )), - "RaidDeviceSettings" : ``(RaidDevices(`settings)), - "LoopCreateWizard" : ``(LoopSetup(false)), - "LoopEditWizard" : ``(LoopSetup(true)), - "RaidExpertWizard" : ``(RaidExpertWizard()), - "RaidMpAutodetect" : ``(RaidMultipathAuto()), - "ReallyInstPrepdisk" : ``(ReallyInstPrepdisk()), - "LvmPv" : ``(WFM::CallFunction("inst_lvm_pv", [true, true])), - "LvmLv" : ``(WFM::CallFunction("inst_lvm_lv", [true, true])), - "S390Zfcp" : ``(WFM::call("xfcp")), - "S390Dasd" : ``(WFM::call("dasd")), - "Evms" : ``(WFM::CallFunction("inst_evms", [true, true])), - "Custom" : ``(WFM::CallFunction("inst_custom_part", [true, true])), - "PrepDiskEnd" : ``(WFM::CallFunction("inst_prepdisk", [true, true])), - "PrepDiskApply" : ``(WFM::CallFunction("inst_prepdisk", [true, true])), - "ReInitSettings" : ``(InitSettings(installation)), - "abort" : ``(AbortDialog()) - ]; - - - map sequence = $[ - "ws_start" : "Custom", - - "RaidTypeWizard" : $[ `abort : "abort", - `cancel : `cancel, - `mp_auto : "RaidMpAutodetect", - `next : "RaidDeviceWizard" ], - - "RaidDeviceWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "RaidExpertWizard" ], - - "RaidMpAutodetect" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "RaidExpertWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "RaidDeviceSettings" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "LoopCreateWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "LoopEditWizard" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom"], - - "ReallyInstPrepdisk" : $[ `abort : `abort, - `cancel : `cancel, - `finish : "PrepDiskEnd", - `apply : "PrepDiskApply" ], - - "Custom" : $[ `abort : `abort, - `cancel : `cancel, - `raid_wizard : "RaidTypeWizard", - `raid_settings : "RaidDeviceSettings", - `loop_create : "LoopCreateWizard", - `loop_edit : "LoopEditWizard", - `backtoi : `back, - `sysnext : "ReallyInstPrepdisk", - `lvm : "LvmPv", - `lvmlv : "LvmLv", - `zfcp : "S390Zfcp", - `dasd : "S390Dasd", - `evms : "Evms", - `again : "Custom", - `apply : "PrepDiskApply", - `instnext : `next ], - - "LvmPv" : $[ `abort : "abort", - `cancel : `cancel, - `next : "LvmLv" ], - - "LvmLv" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "Evms" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "S390Zfcp" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "S390Dasd" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "PrepDiskApply" : $[ `abort : "ReInitSettings", - `cancel : `cancel, - `back : "ReInitSettings", - `next : "ReInitSettings" ], - - "PrepDiskEnd" : $[ `abort : "ReInitSettings", - `cancel : `cancel, - `back : "ReInitSettings", - `next : `next ], - - "ReInitSettings" : $[ `abort : "abort", - `cancel : `cancel, - `next : "Custom" ], - - "abort" : $[ `yes : `abort, - `cancel : `cancel] - ]; + if (!Storage::CheckBackupState("disk")) + Storage::CreateTargetBackup("disk"); + boolean handle_dialog = Mode::normal() || Mode::repair(); - if ( handle_dialog ) { - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("disk"); + if (handle_dialog) + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("disk"); StorageClients::EnablePopup(); } /*************************************************/ /* Let's do the work ... */ /*************************************************/ - symbol ret = Sequencer::Run(aliases, sequence); - /*************************************************/ - y2milestone( "Sequencer ret=%1 handle_dialog=%2", ret, handle_dialog ); - + symbol ret = (symbol) WFM::CallFunction("inst_custom_part", [true, true]); - if( handle_dialog ) - { + if (handle_dialog) + { UI::CloseDialog(); - } + } else - { + { if( ret == `back || ret == `abort ) - { + { Storage::RestoreTargetBackup("disk"); - } + } else if( ret == `next ) - { + { Storage::DisposeTargetBackup("disk"); Storage::SetPartProposalActive(false); - } } + } - y2milestone("Disk module finished"); - Storage::SaveExitKey( ret ); - return( ret ); + Storage::SaveExitKey(ret); + y2milestone("end inst_disk ret:%1", ret); + return ret; } -- 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] r49538 - in /trunk/auditd/src: Auditd.ycp complex.ycp dialogs.ycp
by gs＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: gs Date: Thu Jul 31 11:27:34 2008 New Revision: 49538 URL: http://svn.opensuse.org/viewcvs/yast?rev=49538&view=rev Log: read/write audit.rules Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/complex.ycp trunk/auditd/src/dialogs.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49538&… ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Thu Jul 31 11:27:34 2008 @@ -24,7 +24,6 @@ * Summary: Auditd settings, input and output functions * Authors: Gabriele Mohr <gs(a)suse.de> * - * $Id: Auditd.ycp 41350 2007-10-10 16:59:00Z dfiser $ * * Representation of the configuration of auditd. * Input and output routines. @@ -59,12 +58,33 @@ boolean proposal_valid = false; /** + * Filename (path) rules file + */ +string rules_file = "/etc/audit/audit.rules"; + +/** + * Filename (path) config file + */ +string config_file = "/etc/audit/auditd.conf"; + +/** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. */ boolean write_only = false; /** + * Return rules file path + */ +global string GetRulesFile() { + return rules_file; +} + +global string GetConfigFile() { + return config_file; +} + +/** * Data was modified? * @return true if modified */ @@ -127,16 +147,16 @@ } // -// Settings: Define all variables needed for configuration of laf-audit +// Settings: Define all variables needed for configuration of auditd // /** - * map of audit settings + * map of audit settings (from /etc/audit/auditd.conf) */ map <string, list <string> > SETTINGS = $[]; /** - * map of auditd settings (from /etc/auditd.conf) + * default settings for /etc/audit/auditd.conf */ map <string, list <string> > DEFAULT_CONFIG = $[ "log_file" : ["/var/log/audit/audit.log"], @@ -158,6 +178,14 @@ "disk_error_action" : ["SUSPEND"] ]; +/** + * Rules for auditd (passed via auditctl) read from /etc/audit/audit.rules + */ +string RULES = ""; + +/** + * Get value of given option from SEETINGS + */ global string GetAuditdOption( string key) { list <string> option_list = SETTINGS[key]:DEFAULT_CONFIG[key]:[]; @@ -167,6 +195,10 @@ return ""; } +/** + * Set option to given value in SETTINGS + */ + global boolean SetAuditdOption( string key, string value ) { list <string> option_list = []; @@ -180,14 +212,59 @@ else return false; } - + +/** + * Get all rules + */ +global string GetRules() { + return RULES; +} + +/* + * Set rules + */ +global boolean SetRules( string rules ) { + if ( rules != nil && rules != "" ) + { + RULES = rules; + return true; + } + else + return false; +} + +/** + * Read rules from audit.rules + */ +boolean ReadAuditdRules() { + + string rules = (string)SCR::Read(.target.string, rules_file ); + + if ( rules != nil && rules != "" ) + { + RULES = rules; + return true; + } + else + return false; +} + +/** + * Write rules to audit.rules + */ +boolean WriteAuditdRules() { + boolean success = (boolean)SCR::Write(.target.string, rules_file, RULES ); + return success; +} + + /** * Read settings from auditd.conf * @return true on success */ boolean ReadAuditdSettings() { - if ( ! FileUtils::Exists ("/etc/audit/auditd.conf") ) + if ( ! FileUtils::Exists ( config_file) ) return false; list <string> optionsList = (list <string>) SCR::Dir(.auditd); @@ -201,7 +278,7 @@ if (val != nil) SETTINGS[key] = val; }); - y2milestone("/etc/audit/auditd.conf has been read: %1", SETTINGS); + y2milestone("%1 has been read: %2", config_file, SETTINGS); return true; } @@ -210,7 +287,8 @@ * @return true on success */ global boolean Read() { - + boolean success = true; + /* Auditd read dialog caption */ string caption = _("Initializing auditd Configuration"); @@ -241,17 +319,20 @@ if(PollAbort()) return false; Progress::NextStage(); - boolean success = ReadAuditdSettings(); + success = ReadAuditdSettings(); // Report error - if( !success) Report::Error(_("Cannot read database1.")); + if( !success) Report::Error(_("Cannot read auditd.conf.")); sleep(sl); // read another database if(PollAbort()) return false; Progress::NextStep(); + + success = ReadAuditdRules(); + /* Error message */ - if(false) Report::Error(_("Cannot read database2.")); + if(!success) Report::Error(_("Cannot read audit.rules.")); sleep(sl); // read current settings @@ -273,7 +354,7 @@ boolean WriteAuditdSettings() { boolean success = true; - if ( ! FileUtils::Exists ("/etc/audit/auditd.conf") ) + if ( ! FileUtils::Exists ( config_file ) ) return false; // list all options set in auditd.conf @@ -285,7 +366,7 @@ // This is very important // it flushes the cache, and stores the configuration on the disk SCR::Write(.etc.ssh.sshd_config, nil); - y2milestone("/etc/audit/auditd.conf has been written: %1", SETTINGS); + y2milestone("%1 has been written: %2", config_file, SETTINGS); return true; } @@ -295,7 +376,8 @@ * @return true on success */ global boolean Write() { - + boolean success = true; + /* Auditd read dialog caption */ string caption = _("Saving auditd Configuration"); @@ -311,12 +393,12 @@ /* Progress stage 1/2 */ _("Write the settings"), /* Progress stage 2/2 */ - _("Run SuSEconfig") + _("Write the rules") ], [ /* Progress step 1/2 */ _("Writing the settings..."), /* Progress step 2/2 */ - _("Running SuSEconfig..."), + _("Writing the rules..."), Message::Finished() ], "" @@ -326,16 +408,17 @@ if(PollAbort()) return false; Progress::NextStage(); - boolean success = WriteAuditdSettings(); + success = WriteAuditdSettings(); /* Error message */ - if(!success) Report::Error (_("Cannot write settings.")); + if(!success) Report::Error (_("Cannot write settings to auditd.conf.") ); sleep(sl); // run SuSEconfig if(PollAbort()) return false; Progress::NextStage (); + success = WriteAuditdRules(); /* Error message */ - if(false) Report::Error (Message::SuSEConfigFailed()); + if(!success) Report::Error (_("Cannot write settings to auditd.rules.") ); sleep(sl); if(PollAbort()) return false; Modified: trunk/auditd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/complex.ycp?rev=49538… ============================================================================== --- trunk/auditd/src/complex.ycp (original) +++ trunk/auditd/src/complex.ycp Thu Jul 31 11:27:34 2008 @@ -186,10 +186,28 @@ } void InitRulesDialog( string id ) { + + list<string> rules_list = []; + string rules = Auditd::GetRules(); + + if ( rules != nil && rules != "") + { + rules_list = splitstring( rules, "\n"); + } + + y2milestone( "RULES read from %1: %2", Auditd::GetRulesFile(), rules_list ); + + UI::ChangeWidget( `id( "rules"), `Value, rules ); + y2milestone ( "Init rules dialog" ); } void StoreRulesDialog( string id, map event) { + string rules = (string)UI::QueryWidget( `id("rules"), `Value ); + + Auditd::SetRules( rules ); + + y2debug( "RULES: %1", rules ); y2milestone( "Store rules dialog" ); } Modified: trunk/auditd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/dialogs.ycp?rev=49538… ============================================================================== --- trunk/auditd/src/dialogs.ycp (original) +++ trunk/auditd/src/dialogs.ycp Thu Jul 31 11:27:34 2008 @@ -181,13 +181,14 @@ } term RulesDialogContent() { + return `MarginBox( mbox_x, mbox_y, `VBox( `VSpacing(1.0), `VBox( `Left(`Label(_("Edit rules for audit daemon here"))), `VSpacing(1.0), - `MultiLineEdit(`id(`rules), ("/etc/audit/audit.rules")) + `MultiLineEdit(`id("rules"), Auditd::GetRulesFile() ) ), `VStretch() ) -- 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] r49537 - in /branches/tmp/aschnell/part-redesign/disk/src: disk.ycp disk_worker.ycp
by aschnell＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: aschnell Date: Thu Jul 31 11:16:36 2008 New Revision: 49537 URL: http://svn.opensuse.org/viewcvs/yast?rev=49537&view=rev Log: - some cleanup Modified: branches/tmp/aschnell/part-redesign/disk/src/disk.ycp branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp Modified: branches/tmp/aschnell/part-redesign/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/di… ============================================================================== --- branches/tmp/aschnell/part-redesign/disk/src/disk.ycp (original) +++ branches/tmp/aschnell/part-redesign/disk/src/disk.ycp Thu Jul 31 11:16:36 2008 @@ -16,20 +16,15 @@ * Wrapper file for inst_disk.ycp * */ - { - -/*** - * <h3>Configuration of the disk</h3> - */ - textdomain "storage"; import "Popup"; import "Wizard"; import "Misc"; - string msg=_("Only use this program if you are familiar with partitioning hard disks. + + string msg = _("Only use this program if you are familiar with partitioning hard disks. Never partition disks that may, in any way, be in use (mounted, swap, etc.) unless you know exactly what you are @@ -39,10 +34,10 @@ To continue despite this warning, click Yes. "); - any ret = `back; // no params == UI, some params == commandline - if (size (WFM::Args()) == 0) { + if (size (WFM::Args()) == 0) + { Wizard::CreateDialog(); Wizard::SetContents ( _("Expert Partitioner"), @@ -53,7 +48,6 @@ ); Wizard::SetTitleIcon ("yast-disk"); - ret = `back; // popup headline integer warn = tointeger(Misc::SysconfigRead( .sysconfig.storage.WARN_EXPERT, "1" )); y2milestone( "warn:%1", warn ); @@ -61,16 +55,18 @@ warn = 1; if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); - ret = WFM::call("disk_worker", WFM::Args()); + any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); } else { - y2milestone ("User decided not to run storage..."); + y2milestone ("User decided not to run disk..."); } Wizard::CloseDialog(); - } else { + } + else + { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); - ret = WFM::call("disk_worker", WFM::Args()); + any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); } Modified: branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/di… ============================================================================== --- branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp (original) +++ branches/tmp/aschnell/part-redesign/disk/src/disk_worker.ycp Thu Jul 31 11:16:36 2008 @@ -16,40 +16,35 @@ * Wrapper file for inst_disk.ycp * */ - { + textdomain "storage"; -/*** - * <h3>Configuration of the disk</h3> - */ + import "CommandLine"; + import "Storage"; - textdomain "storage"; - import "CommandLine"; - import "StorageClients"; - import "Popup"; - import "Storage"; - -define any DiskSequence () { - Storage::SwitchUiAutomounter( false ); - any ret = WFM::CallFunction("inst_disk", [ true, true ]); - Storage::SwitchUiAutomounter( true ); - Storage::SaveUsedFs(); + any DiskSequence() + { + Storage::SwitchUiAutomounter(false); + any ret = WFM::CallFunction("inst_disk", [ true, true ]); + Storage::SwitchUiAutomounter(true); + Storage::SaveUsedFs(); + + return ret; + } - return ret; -} -/* -- the command line description map -------------------------------------- */ -map cmdline = $[ - "id" : "disk", - // translators: command line help text for disk module - "help" : _("Disk partitioner"), - // custum help text (should replace default one) - "customhelp" : _("Command line interface for the partitioner module is not available"), - "guihandler" : DiskSequence, -]; + /* -- the command line description map -------------------------------------- */ + map cmdline = $[ + "id" : "disk", + // translators: command line help text for disk module + "help" : _("Disk partitioner"), + // custum help text (should replace default one) + "customhelp" : _("Command line interface for the partitioner module is not available"), + "guihandler" : DiskSequence, + ]; -CommandLine::Run (cmdline); -return true; + CommandLine::Run(cmdline); + return true; } -- 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] r49536 - /trunk/core/agent-ini/src/Y2CCIniAgent.h
by mvidner＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: mvidner Date: Thu Jul 31 10:57:54 2008 New Revision: 49536 URL: http://svn.opensuse.org/viewcvs/yast?rev=49536&view=rev Log: removed a file that is long obsolete Removed: trunk/core/agent-ini/src/Y2CCIniAgent.h -- 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] r49535 - /tags/stable-2_17_7/bootloader/
by juhliarik＠svn.opensuse.org 31 Jul '08

31 Jul '08

Author: juhliarik Date: Thu Jul 31 10:36:17 2008 New Revision: 49535 URL: http://svn.opensuse.org/viewcvs/yast?rev=49535&view=rev Log: Created tag stable-2_17_7 for bootloader Added: tags/stable-2_17_7/bootloader/ - copied from r49534, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0