Mark Gurevich
97cfcac18e
Merge pull request #4339 from whowutwut/rflash_nonverbose_singlemsg
...
[OpenBMC] rflash - Add messages to inform the user of the general action started via xCAT
2017-11-27 09:17:42 -05:00
Miro
aaacca80cd
Fix merging in xdcpmerge.sh ( #4328 )
...
* Fixes in xdcpmerge.sh
Two fixes:
1. The grep pattern when finding duplicate usernames is missing ":" at the end. So, for example user "test" would also match "test2, etc.". Adding the ":" delimiter fixes the issue.
2. Another issue happens when the file to be merged is a superset of the files on the nodes. For example, if a new user is added and entire passwd file (that is otherwise identical) is sent to be merged. In this case, the $filebackup.nodups file, i.e. the original file with duplicates removed, becomes empty and the condition "if [ -s "$filebackup.nodups" ]" does not execute. Then the merged file ends up being original file with the merge file fully appended, clearly not what was intended.
This is solved by changing the condition to check for file existence "-a" rather then for size. Additionally, I also turn the logic around so that the duplicates are removed from the merge file and then added to the original file. I think this makes logic a bit cleaner and also ensures that existing entries are not reordered or changed in any way.
* Streamlining previous commit
Adjustment to previous commit, streamlining and simplifying logic. Once $mergefile.nodups is created, just concatenate it the original file.
* Update to xdcpmerge
No need to copy $filebackup to $curfile, they are the same.
2017-11-26 20:20:49 -06:00
zet809
80f587b7fc
Merge pull request #4326 from xuweibj/NT3339
...
Task 3339, rspconfig ip/netmask/gateway/vlan support
2017-11-24 16:07:20 +08:00
XuWei
58c9ebd95f
modified depending on comments
2017-11-24 02:38:31 -05:00
xuweibj
6315852abd
Merge pull request #4351 from whowutwut/openbmc_rinv_indicator
...
[OpenBMC] Fix bug with rinv <> firm to display active firmware
2017-11-22 08:52:58 +08:00
Matt Ezell
50fdcec19d
Fix #4330 , close the socket
2017-11-21 09:44:02 -05:00
XuWei
99faf3ff89
Fix 4338, remove all of in child process
2017-11-21 02:25:28 -05:00
Gᴏɴɢ Jie
a362033084
Merge pull request #4220 from samveen/fix_xhrm
...
Improve xHRM
2017-11-21 10:21:11 +08:00
Victor Hu
2c2748a548
Fix bug, anything in the functional array is the one that's really active, priority will not be 0 if there is pending firmware
2017-11-20 20:58:16 -05:00
Victor Hu
5db9e6dcec
Add messages to inform the user of the general action started via xCAT for flashing firmware
2017-11-20 11:06:19 -05:00
Matt Ezell
d862891201
Use IO::Socket to check BMC console port
2017-11-18 14:54:04 -05:00
Victor Hu
23f2b1c864
Merge pull request #4322 from gurevichmark/openbmc_rflash_hash_mismatch
...
Verify hash ID before activating uploaded firmware
2017-11-17 15:28:47 -05:00
Mark Gurevich
9b7a8eccc7
Enhancements after the review
2017-11-17 11:50:45 -05:00
zet809
2cdd1d2724
Merge pull request #4296 from chenglch/goconserver
...
Add makegocons command
2017-11-17 17:45:58 +08:00
chenglch
071f336c17
Fix some bus in makegocons
2017-11-17 17:17:24 +08:00
zet809
be1dc2a6a9
Merge pull request #4320 from xuweibj/I4264
...
Modify timeout of login by curl command for OpenBMC
2017-11-17 17:09:49 +08:00
XuWei
5ae2aadc5f
modified depending on comments
2017-11-17 01:54:21 -05:00
XuWei
93eadce997
Task 3339, rspconfig ip/netmask/gateway/vlan support
2017-11-17 01:42:19 -05:00
zet809
be9116f5ff
Merge pull request #4289 from xuweibj/T4235
...
Task 4235, rspconfig BMC dump for OpenBMC
2017-11-17 14:12:04 +08:00
Samveen
b314b1eb3b
natural_sort_cmp: recursion to iterative implementation ( #4314 )
...
* natural_sort_cmp: recursion to iterative implementation
* natural_sort_cmp: correct prototype with parameters, as per `man perlfunc`
2017-11-16 23:52:24 -06:00
zet809
a57d399e75
Merge pull request #4263 from jjohnson42/skipbmconreseat
...
Skip connection to BMC on rpower reseat
2017-11-17 11:14:46 +08:00
zet809
99884208c7
Merge pull request #4309 from cxhong/openbmccons
...
[openbmc]Do not send exec command to bmc console if bmc is not reachable
2017-11-17 11:12:30 +08:00
XuWei
80966800e2
modified depending on comments
2017-11-16 22:08:31 -05:00
zet809
f816d95799
enhance nodediscovery process: don't write "NOIP" if the node can not be resloved to an IP ( #3995 )
...
* enhance nodediscovery process, if only 1 mac and have \*NOIP\* append, don't write mac table and don't generate dhcp lease entry
* Enhance PR 3995: enhance nodediscovery process: don't write "NOIP" if the node can not be resloved to an IP
2017-11-16 21:07:45 -06:00
Casandra Qiu
0b9aae5754
change log messages
2017-11-16 14:49:32 -05:00
Mark Gurevich
8ecd711c3d
Verify hash ID
2017-11-16 13:37:16 -05:00
Mark Gurevich
b1b310b302
Merge pull request #4312 from whowutwut/unknown_purpose
...
[OpenBMC] Initialize variables to Unknown in loop incase BMC doesn't respond with values
2017-11-16 10:41:09 -05:00
chenglch
abab9d89c5
Add makegocons command
...
This patch enable goconserver service and manage the node sessions
with a new `makegocons` command.
Implement: #4215
2017-11-16 17:56:26 +08:00
XuWei
fd8ba44039
Modify timeout of login by curl command for OpenBMC
2017-11-16 03:44:04 -05:00
Samveen
0d924af0fe
dodiscovery: better disksize - ordered by major,minor and no \n ( #4219 )
...
* better disksize: ordered by major,minor and no `\n`
* nodediscover:`disksize` sent correctly: no need to `split`,`join`
* general sort with explicit key columns, fix search pattern
* dodiscovery: Fix bugs
* dodiscovery: Fix ShellCheck SC2007,SC2004
* dodiscovery: simpler kcmdline parsing, disksize as IEC binary prefix
2017-11-16 01:49:54 -06:00
Victor Hu
a88903e0e1
Initialize variables to Unknown in loop incase BMC doesn't respond with any values
2017-11-15 23:00:45 -05:00
Bin Xu
585d771ed1
Introduce a natural compare func for sorting array and using it for rinv/rvital ( #4307 )
...
* Introduce a natural compare func for sorting array and using it for rinv/rvital
* 1, Remove the comments for previous codes 2,not using a new array variable there
2017-11-15 21:31:03 -06:00
Casandra Qiu
f6690b648e
[openbmc]Do not send exec command for bmc console if bmc is not reachable
2017-11-15 16:56:16 -05:00
Yuan Bai
4a6639233a
Merge pull request #4275 from immarvin/onissue
...
Support http repos for otherpkgs #4042
2017-11-15 10:33:24 +08:00
Mark Gurevich
f781e5bfed
openbmc rflash reduce output and msg enhancements
2017-11-14 17:40:33 -05:00
Samveen Gulati
76b477c398
Error redirection for checks
2017-11-14 08:38:24 +00:00
Samveen Gulati
07add8e288
Fix back multi-ip transfer from port to bridge
2017-11-14 08:29:08 +00:00
Samveen Gulati
5e93ea3b39
Fix logic for bridgeprereq parameter parsing
2017-11-14 08:28:30 +00:00
Samveen Gulati
c4f4760eb4
xHRM: migrate existing IP conf of $PORTS to bridge
2017-11-14 07:38:26 +00:00
Samveen Gulati
99ae556314
xHRM: more improvments via ShellCheck
2017-11-14 07:38:26 +00:00
Samveen Gulati
817009c218
xHRM: improvments via ShellCheck
2017-11-14 07:38:26 +00:00
Samveen Gulati
3b05e6d633
xHRM: modernize command substitution
2017-11-14 07:38:26 +00:00
Bin Xu
f9a1ef15cb
Fix #4288 , Show the milliseconds for elapsed time of command execution ( #4290 )
2017-11-13 23:41:56 -06:00
XuWei
8591620a13
Task 4235, rspconfig BMC dump for OpenBMC
2017-11-13 21:23:12 -05:00
Victor Hu
de172212f1
Merge pull request #4265 from chenglch/openbmc
...
Fix the message for openbmc cons
2017-11-13 20:57:34 -05:00
xuweibj
5f4051f3d4
Merge pull request #4283 from whowutwut/4236
...
Fix bug in the output if rinv firm verbose that was displaying * for all listings
2017-11-14 09:55:34 +08:00
Victor Hu
796aa8dccb
Merge pull request #4258 from zet809/disable_check_ipsrc_for_bmcdiscover
...
Disable option --check and --ipsource for bmcdiscover
2017-11-13 20:20:52 -05:00
ertaozh
64e831d7ee
Modify the error information for --check and --ipsource for bmcdiscover
2017-11-13 03:44:11 -05:00
immarvin
e261973c05
Support http repos for otherpkgs #4042
2017-11-13 00:47:50 -05:00
Victor Hu
03f3fe0c6e
Fix bug in the output if rinv firm verbose that was displaying * for all active listings
2017-11-10 15:08:09 -05:00
