resubmitted :-)
On Wed, Nov 16, 2005 at 07:44:21AM -0800, Anand Babu wrote:
> Hi,
> diffs for extensions/ doc/ and man page to add --delete-event-id
> to ipmi-sel (sel.scm)
> tested on zresearch.com ipmi
>
> I would like to reserve '-e' option to list the SEL records matching
> the event-id. I recommend to use some other option or not give any
> single-char option at all. Can please you re-submit the patch :D
>
> --
> Anand Babu
> GPG Key ID: 0x62E15A31
> Blog [http://ab.freeshell.org]
> The GNU Operating System [http://www.gnu.org]
>
>
> _______________________________________________
> Freeipmi-devel mailing list
> [email protected]
> http://lists.gnu.org/mailman/listinfo/freeipmi-devel
>
---end quoted text---
diff -pruN freeipmi/doc/freeipmi.texi freeipmi-hack/doc/freeipmi.texi
--- freeipmi/doc/freeipmi.texi 2005-11-16 02:12:36.000000000 +0530
+++ freeipmi-hack/doc/freeipmi.texi 2005-11-16 02:18:40.000000000 +0530
@@ -3011,6 +3011,9 @@ you view and manage system event log.
@item -r START-END, ---delete-range=START-END @*
Delete all records in the range of START to END in the SEL.
+
[EMAIL PROTECTED] ---delete-event-id=ID @*
+ Delete all records which have the event as @var{ID}.
@end itemize
@node ipmi-sel sample output, , ipmi-sel options, ipmi-sel
diff -pruN freeipmi/fish/extensions/sel.scm
freeipmi-hack/fish/extensions/sel.scm
--- freeipmi/fish/extensions/sel.scm 2005-11-16 02:12:36.000000000 +0530
+++ freeipmi-hack/fish/extensions/sel.scm 2005-11-16 02:20:07.000000000
+0530
@@ -90,7 +90,8 @@
(delete (single-char #\d) (value #t))
(delete-all (single-char #\c) (value #f))
(hex-dump (single-char #\x) (value
optional))
- (delete-range (single-char #\r) (value
#t))))
+ (delete-range (single-char #\r) (value
#t))))
+ ;;(delete-event-id (single-char #\e) (value
#t))))
(options (getopt-long args option-spec))
(poll-interval (option-ref options 'poll-interval #f))
(sms-io-base (option-ref options 'sms-io-base #f))
@@ -107,6 +108,7 @@
(delete-all (option-ref options 'delete-all #f))
(hex-dump-name (option-ref options 'hex-dump #f))
(delete-range (option-ref options 'delete-range #f))
+ (delete-event-id (option-ref options 'delete-event-id #f))
(extra-args (option-ref options '() #f)))
;; extra arguments
(if (and (not (null? extra-args)) (list? sel-cmd-args))
@@ -272,7 +274,7 @@
(set! sel-cmd-args (append sel-cmd-args
(list hex-dump-name))))
- ;; --delete-range (14)
+ ;; --delete-range (14) SEL specific
(if (and (string? delete-range) (list? sel-cmd-args))
(begin
(set! delete-range (sentence->tokens (string-replace
@@ -292,6 +294,26 @@
(if (list? sel-cmd-args)
(set! sel-cmd-args (append sel-cmd-args
(list delete-range))))
+
+ ; --delete-event-id ID (15) SEL specific
+ (if (and (string? delete-event-id)
+ (list? sel-cmd-args)
+ (not (string->number delete-event-id)))
+ (begin
+ (display "Usage: ipmi-sel [OPTION...] \n"
+ (current-error-port))
+ (display "Try `ipmi-sel --help' or `ipmi-sel --usage' for
more information.\n"
+ (current-error-port))
+ (set! sel-exit-status 64)
+ (set! sel-cmd-args #f)))
+ (if (list? sel-cmd-args)
+ (begin
+ (and (string? delete-event-id)
+ (set! delete-event-id (string->number
+ delete-event-id)))
+ (set! sel-cmd-args (append sel-cmd-args
+ (list delete-event-id)))))
+
sel-cmd-args))
(lambda (k args . opts)
(display "sel: error: " (current-error-port))
@@ -328,6 +350,9 @@
(define (sel-get-delete-range-option cmd-args)
(list-ref cmd-args 14))
+(define (sel-get-delete-event-id-option cmd-args)
+ (list-ref cmd-args 15))
+
(define (sel-display-entry sel)
(display (list-ref sel 0)) (display ":")
(display (list-ref sel 1)) (display ":")
@@ -358,6 +383,19 @@
(sel-display-entry (fi-sel-get-next-entry)))))))
(sel-display-entry (fi-sel-get-first-entry))))
+(define (sel-get-record-list)
+ (letrec
+ ((remaining-records (lambda ()
+ (let ((entry (fi-sel-get-next-entry-raw)))
+ (cond ((null? entry) '())
+ (else (append (list entry)
+ (remaining-records))))))))
+ (let ((first-entry (fi-sel-get-first-entry-raw)))
+ (append (list (if (null? first-entry) '() first-entry))
+ (if (null? first-entry) '() (remaining-records))))))
+
+(define (sel-record-foreach call-me)
+ (map call-me (sel-get-record-list)))
(define (sel-delete-record-list delete-list)
(if (not (null? delete-list))
@@ -442,6 +480,15 @@
((sel-get-delete-range-option cmd-args)
(sel-delete-record-list (range->list
(sel-get-delete-range-option cmd-args))))
+ ((sel-get-delete-event-id-option cmd-args)
+ (sel-record-foreach (lambda (a-sel)
+ (and (= (length a-sel) 16)
+ (= (list-ref a-sel 11)
+ (sel-get-delete-event-id-option
+ cmd-args))
+ (fi-sel-delete-entry
+ (+ (list-ref a-sel 0)
+ (* 256 (list-ref a-sel 1))))))))
(else
(sel-display-all-entry)))
(fi-ipmi-close))))))
diff -pruN freeipmi/fish/ipmi-sel.8.in freeipmi-hack/fish/ipmi-sel.8.in
--- freeipmi/fish/ipmi-sel.8.in 2005-11-16 02:12:36.000000000 +0530
+++ freeipmi-hack/fish/ipmi-sel.8.in 2005-11-16 02:17:26.000000000 +0530
@@ -25,6 +25,13 @@ Delete all records in SEL
.TP
\fB\-d REC-LIST\fR, \fB\-\-delete=REC-LIST\fR
Delete REC-LIST in SEL
+.TP
+\fB\-\-delete-range=START-END\fR
+Delete records from START to END in SEL
+.TP
+\fB\-\-delete-event-id=ID\fR
+Delete all records having event-id = ID
+.TP
.SH "EXAMPLES"
.B # ipmi-sel
.PP
@@ -44,6 +51,10 @@ Delete range of entries 12 to 42.
.PP
.B # ipmi-sel --delete-range 12-42
.PP
+Delete records of type 3.
+.PP
+.B # ipmi-sel --delete-event-id 3
+.PP
Show SEL version and general information.
.PP
.B # ipmi-sel --hex-dump
_______________________________________________
Freeipmi-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/freeipmi-devel
