November 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66683 - /tags/stable-2_21_2/tftp-server/
by locilka＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: locilka Date: Thu Nov 3 14:09:08 2011 New Revision: 66683 URL: http://svn.opensuse.org/viewcvs/yast?rev=66683&view=rev Log: Created tag stable-2_21_2 for tftp-server Added: tags/stable-2_21_2/tftp-server/ - copied from r66682, trunk/tftp-server/ -- 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] r66682 - in /trunk/tftp-server: VERSION package/yast2-tftp-server.changes testsuite/tests/readwrite.out
by locilka＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: locilka Date: Thu Nov 3 14:08:47 2011 New Revision: 66682 URL: http://svn.opensuse.org/viewcvs/yast?rev=66682&view=rev Log: - Fixed testsuite - 2.21.2 Modified: trunk/tftp-server/VERSION trunk/tftp-server/package/yast2-tftp-server.changes trunk/tftp-server/testsuite/tests/readwrite.out Modified: trunk/tftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/VERSION?rev=66682&r1… ============================================================================== --- trunk/tftp-server/VERSION (original) +++ trunk/tftp-server/VERSION Thu Nov 3 14:08:47 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/tftp-server/package/yast2-tftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/package/yast2-tftp-s… ============================================================================== --- trunk/tftp-server/package/yast2-tftp-server.changes (original) +++ trunk/tftp-server/package/yast2-tftp-server.changes Thu Nov 3 14:08:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 3 14:08:48 CET 2011 - locilka(a)suse.cz + +- Fixed testsuite +- 2.21.2 + +------------------------------------------------------------------- Mon Sep 26 15:06:35 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/tftp-server/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/testsuite/tests/read… ============================================================================== --- trunk/tftp-server/testsuite/tests/readwrite.out (original) +++ trunk/tftp-server/testsuite/tests/readwrite.out Thu Nov 3 14:08:47 2011 @@ -5,7 +5,6 @@ Read .etc.xinetd_d.tftp.value.tftp.server_args "-s -v /srv/boot" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Write .etc.xinetd_d.tftp.value.tftp."{" "" true Write .etc.xinetd_d.tftp.value_type.tftp."{" 1 true @@ -22,5 +21,4 @@ Read .init.scripts.comment "xinetd" $["inetd":$[], "network":$[], "networkmanager":$[], "xinetd":$[]] Execute .target.bash "/usr/bin/killall in.tftpd" 0 Execute .target.bash_output "/sbin/service xinetd restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":"p3316\ncxinetd\n"] -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 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] r66681 - /tags/stable-2_21_2/nfs-server/
by locilka＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: locilka Date: Thu Nov 3 14:04:58 2011 New Revision: 66681 URL: http://svn.opensuse.org/viewcvs/yast?rev=66681&view=rev Log: Created tag stable-2_21_2 for nfs-server Added: tags/stable-2_21_2/nfs-server/ - copied from r66680, trunk/nfs-server/ -- 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] r66680 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Volume.cc libstorage/src/Volume.h package/yast2-storage.changes
by fehr＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: fehr Date: Thu Nov 3 13:54:09 2011 New Revision: 66680 URL: http://svn.opensuse.org/viewcvs/yast?rev=66680&view=rev Log: - fix fstab handling when mount-by-uuid is reformatted (bnc#728000) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Thu Nov 3 13:54:09 2011 @@ -542,9 +542,7 @@ if (!entry.fs_uuid.empty()) { - uuid = entry.fs_uuid; - alt_names.remove_if(string_contains("/by-uuid/")); - alt_names.push_back("/dev/disk/by-uuid/" + uuid); + updateUuid(entry.fs_uuid); } if (!entry.fs_label.empty()) @@ -916,6 +914,13 @@ return( ret ); } +void Volume::updateUuid( const string& new_uuid ) + { + uuid = new_uuid; + alt_names.remove_if(string_contains("/by-uuid/")); + alt_names.push_back("/dev/disk/by-uuid/" + uuid); + } + int Volume::doFormat() { static int fcount=1000; @@ -1083,6 +1088,10 @@ if( ret==0 ) { triggerUdevUpdate(); + Blkid blkid(mountDevice()); + Blkid::Entry entry; + if( findBlkid( blkid, entry ) && entry.is_fs && !entry.fs_uuid.empty()) + updateUuid( entry.fs_uuid ); } if( ret==0 && !orig_mp.empty() ) { @@ -2734,6 +2743,7 @@ else if( l ) ret = l->loopFile(); } + y2mil( "dev:" << dev << " ret:" << ret ); return( ret ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.h Thu Nov 3 13:54:09 2011 @@ -217,6 +217,7 @@ void getLoopData( SystemCmd& loopData ); void getMountData(const ProcMounts& mounts, bool swap_only = false); void getFstabData( EtcFstab& fstabData ); + void updateUuid( const string& new_uuid ); void replaceAltName( const string& prefix, const string& newn ); string getMountByString() const; string getFstabDevice() const; Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Nov 3 13:54:09 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Nov 3 10:55:36 CET 2011 - fehr(a)suse.de +- fix fstab handling when mount-by-uuid is reformatted (bnc#728000) - add local static struct to getContVolInfo to prevent strings from being freed while perl interface might still access them -- 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] r66679 - in /trunk/nfs-server: VERSION package/yast2-nfs-server.changes testsuite/tests/readwrite-unfsd.out testsuite/tests/readwrite.out testsuite/tests/readwrite2.out
by locilka＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: locilka Date: Thu Nov 3 13:48:25 2011 New Revision: 66679 URL: http://svn.opensuse.org/viewcvs/yast?rev=66679&view=rev Log: - Fixed testsuites - 2.21.2 Modified: trunk/nfs-server/VERSION trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/testsuite/tests/readwrite-unfsd.out trunk/nfs-server/testsuite/tests/readwrite.out trunk/nfs-server/testsuite/tests/readwrite2.out Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=66679&r1=… ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Thu Nov 3 13:48:25 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Thu Nov 3 13:48:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 3 13:48:33 CET 2011 - locilka(a)suse.cz + +- Fixed testsuites +- 2.21.2 + +------------------------------------------------------------------- Wed Sep 21 11:42:35 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite-unfsd.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.out Thu Nov 3 13:48:25 2011 @@ -6,7 +6,6 @@ Read .sysconfig.nfs.NFS_SECURITY_GSS nil Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Write OK Read .target.dir "/projects" nil @@ -34,7 +33,6 @@ Execute .target.bash_output "/sbin/service nfslock restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash_output "/sbin/service nfsserver start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfsserver status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Write KO Read .target.dir "/projects" nil Modified: trunk/nfs-server/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite.out Thu Nov 3 13:48:25 2011 @@ -6,7 +6,6 @@ Read .sysconfig.nfs.NFS_SECURITY_GSS nil Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Write OK Read .target.dir "/projects" nil @@ -33,7 +32,6 @@ Execute .target.bash_output "/sbin/service nfslock restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash_output "/sbin/service nfsserver start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfsserver status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Write KO Read .target.dir "/projects" nil Modified: trunk/nfs-server/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite2.out Thu Nov 3 13:48:25 2011 @@ -8,7 +8,6 @@ Read .sysconfig.nfs.NFS_SECURITY_GSS nil Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Write - services will be stopped @@ -30,7 +29,6 @@ Execute .target.bash_output "/sbin/service nfslock stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Read - services are running @@ -69,7 +67,6 @@ Execute .target.bash_output "/sbin/service nfslock restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash_output "/sbin/service nfsserver start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfsserver status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Read - services are stopped @@ -99,7 +96,6 @@ Execute .target.bash_output "/sbin/service nfslock stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Read - services are stopped @@ -140,5 +136,4 @@ Execute .target.bash_output "/sbin/service nfslock restart" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash_output "/sbin/service nfsserver start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfsserver status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 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] r66678 - /tags/stable-2_21_2/nfs-client/
by locilka＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: locilka Date: Thu Nov 3 13:41:45 2011 New Revision: 66678 URL: http://svn.opensuse.org/viewcvs/yast?rev=66678&view=rev Log: Created tag stable-2_21_2 for nfs-client Added: tags/stable-2_21_2/nfs-client/ (props changed) - copied from r66677, trunk/nfs-client/ -- 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] r66677 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes testsuite/tests/readwrite.out testsuite/tests/readwrite2.out
by locilka＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: locilka Date: Thu Nov 3 13:41:19 2011 New Revision: 66677 URL: http://svn.opensuse.org/viewcvs/yast?rev=66677&view=rev Log: - Fixed testsuites - 2.21.2 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/testsuite/tests/readwrite.out trunk/nfs-client/testsuite/tests/readwrite2.out Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=66677&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Thu Nov 3 13:41:19 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Nov 3 13:41:19 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 3 13:40:49 CET 2011 - locilka(a)suse.cz + +- Fixed testsuites +- 2.21.2 + +------------------------------------------------------------------- Wed Sep 21 10:54:32 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/nfs-client/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite.out (original) +++ trunk/nfs-client/testsuite/tests/readwrite.out Thu Nov 3 13:41:19 2011 @@ -4,7 +4,6 @@ Read .etc.idmapd_conf "Domain" "localhost" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Write OK Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] @@ -26,7 +25,6 @@ Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfs status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Write KO Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] Modified: trunk/nfs-client/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-client/testsuite/tests/readwrite2.out Thu Nov 3 13:41:19 2011 @@ -6,7 +6,6 @@ Read .etc.idmapd_conf "Domain" "localhost" Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0 Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Write - nfs is in use - start services @@ -29,7 +28,6 @@ Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfs status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Read - nfs is in use & stopped @@ -61,7 +59,6 @@ Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0 Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Execute .target.bash "/sbin/service nfs status" $["TERM":"raw"] 0 -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Read - nfs not used & running @@ -78,7 +75,6 @@ Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true Dump Dump Read - nfs not used & services are stopped @@ -95,5 +91,4 @@ Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash "/sbin/service SuSEfirewall2_init status" $["TERM":"raw"] 0 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] r66676 - /tags/branch-Code-11-SP2-2_17_30/iscsi-client/
by fehr＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: fehr Date: Thu Nov 3 13:11:41 2011 New Revision: 66676 URL: http://svn.opensuse.org/viewcvs/yast?rev=66676&view=rev Log: Created tag branch-Code-11-SP2-2_17_30 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_30/iscsi-client/ (props changed) - copied from r66675, branches/SuSE-Code-11-SP2-Branch/iscsi-client/ -- 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] r66675 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp src/widgets.ycp
by fehr＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: fehr Date: Thu Nov 3 13:11:32 2011 New Revision: 66675 URL: http://svn.opensuse.org/viewcvs/yast?rev=66675&view=rev Log: - vesion 2.17.30 - call discovery with "-t fw" if "-t st" does not provide any targets (bnc#725833) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Thu Nov 3 13:11:32 2011 @@ -1 +1 @@ -2.17.29 +2.17.30 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Nov 3 13:11:32 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 3 13:06:10 CET 2011 - fehr(a)suse.de + +- 2.17.30 +- call discovery with "-t fw" if "-t st" does not provide any + targets (bnc#725833) + +------------------------------------------------------------------- Wed Oct 26 15:26:38 CEST 2011 - fehr(a)suse.de - 2.17.29 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Thu Nov 3 13:11:32 2011 @@ -857,9 +857,9 @@ }); } -global string GetDiscoveryCmd( string ip, string port) +global string GetDiscoveryCmd( string ip, string port, boolean fw) { - y2milestone( "GetDiscoveryCmd ip:%1 port:%2", ip, port); + y2milestone( "GetDiscoveryCmd ip:%1 port:%2 fw:%3", ip, port, fw); string command = "-m discovery -P 1"; if( useISNS() ) command = command + " -t isns"; @@ -869,7 +869,11 @@ y2milestone( "ifs=%1", ifs ); ifs = maplist( string s, ifs, ``("-I "+s)); y2milestone( "ifs=%1", ifs ); - command = command + sformat( " -t st %3 -p %1:%2", ip, port, mergestring(ifs," ")); + string tgt = "st"; + if( fw ) + tgt = "fw"; + command = command + sformat( " -t %4 %3 -p %1:%2", ip, port, + mergestring(ifs," "), tgt); } command = GetAdmCmd(command); y2milestone( "GetDiscoveryCmd %1", command ); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/widgets.ycp Thu Nov 3 13:11:32 2011 @@ -472,10 +472,16 @@ //y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out); bg_finish=false; // ` with authentication - string command = IscsiClientLib::GetDiscoveryCmd(ip,port); + string command = IscsiClientLib::GetDiscoveryCmd(ip,port,false); list<string>trg_list = runInBg( command ); - IscsiClientLib::targets = IscsiClientLib::ScanDiscovered( trg_list ); while(!bg_finish){}; + if( size(trg_list)==0 ) + { + command = IscsiClientLib::GetDiscoveryCmd(ip,port,true); + trg_list = runInBg( command ); + while(!bg_finish){}; + } + IscsiClientLib::targets = IscsiClientLib::ScanDiscovered( trg_list ); // restore old config IscsiClientLib::oldConfig(); -- 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] r66674 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call startup/common/network.sh startup/common/vnc.sh
by aschnell＠svn2.opensuse.org 03 Nov '11

03 Nov '11

Author: aschnell Date: Thu Nov 3 12:20:48 2011 New Revision: 66674 URL: http://svn.opensuse.org/viewcvs/yast?rev=66674&view=rev Log: - use same code to display ip addresses during vnc and ssh installation (bnc#727802) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/installation/startup/common/network.sh trunk/installation/startup/common/vnc.sh Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=66674&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Nov 3 12:20:48 2011 @@ -1 +1 @@ -2.21.27 +2.21.28 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Nov 3 12:20:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 03 11:52:08 CET 2011 - aschnell(a)suse.de + +- use same code to display ip addresses during vnc and ssh + installation (bnc#727802) +- 2.21.28 + +------------------------------------------------------------------- Wed Nov 2 17:14:51 CET 2011 - fcrozat(a)suse.com - Ensure network is not started by systemd before Firstboot / Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Thu Nov 3 12:20:48 2011 @@ -392,6 +392,7 @@ # 1) Source common script functions #--------------------------------------------- . /usr/lib/YaST2/startup/common/functions.sh +. /usr/lib/YaST2/startup/common/network.sh . /usr/lib/YaST2/startup/requires #============================================= Modified: trunk/installation/startup/common/network.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/common/netw… ============================================================================== --- trunk/installation/startup/common/network.sh (original) +++ trunk/installation/startup/common/network.sh Thu Nov 3 12:20:48 2011 @@ -41,6 +41,13 @@ return 1 } + +function list_ifaces() +{ + /sbin/ifconfig | grep -A1 "^[a-z]" +} + + #----[ vnc_message ]-----# function vnc_message () { #-------------------------------------------------- @@ -70,7 +77,6 @@ active interfaces: EOF - /sbin/ifconfig | grep -A1 "^[a-z]" + list_ifaces echo } - Modified: trunk/installation/startup/common/vnc.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/common/vnc.… ============================================================================== --- trunk/installation/startup/common/vnc.sh (original) +++ trunk/installation/startup/common/vnc.sh Thu Nov 3 12:20:48 2011 @@ -44,38 +44,27 @@ # start Xvnc server and write a log file from the # VNC server process # - # .../ # The IP set in install.inf may not be valid if the DHCP server # gave us a different lease in the meantime (#43974). - # sed: don't print; if it's localhost, skip; try locating IPv4; - # skip if not found; otherwise print and exit - # ---- - IP=`ip addr list | sed -n \ - -e '/127.0.0.[[:digit:]]/b;s/^[[:space:]]*inet[[:space:]]$[^/]*$.*/\1/;T;p;q'` echo echo starting VNC server... echo A log file will be written to: /var/log/YaST2/vncserver.log ... cat <<-EOF - + *** - *** You can connect to $IP, display :1 now with vncviewer - *** Or use a Java capable browser on http://$IP:5801/ + *** You can connect to <host>, display :1 now with vncviewer + *** Or use a Java capable browser on http://<host>:5801/ *** - + (When YaST2 is finished, close your VNC viewer and return to this window.) - + + Active interfaces: + EOF - #========================================== - # Fake hostname to make VNC screen pretty - #------------------------------------------ - if [ "$(hostname)" = "(none)" ] ; then - hostname $IP - fi - #========================================== - # store hostname for use in desktop option - #------------------------------------------ - VNC_HOSTNAME=`hostname` + list_ifaces + echo + #========================================== # Start Xvnc... # For -noreset see BNC #351338 @@ -83,7 +72,7 @@ $Xbindir/Xvnc $Xvncparam :0 \ -noreset \ -rfbauth /root/.vnc/passwd.yast \ - -desktop "Installation at: $VNC_HOSTNAME" \ + -desktop "Installation" \ -geometry 800x600 \ -depth 16 \ -rfbwait 120000 \ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0