tyler.durden/hwraid
1
0
Fork 0
mirror of https://github.com/eLvErDe/hwraid.git synced 2025-07-26 07:14:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update cciss-vol-status packaging (synced with Buster package)

Browse Source
This commit is contained in:
Adam Cecile 2019-07-03 13:11:52 +02:00
parent 56d9155d3c
commit 3f8436974e
8 changed files with 208 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packaging/debian/cciss-vol-status/cciss-vol-status.cciss-vol-statusd.init
View File

@ -6,6 +6,7 @@
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: cciss-vol-statusd # Provides: cciss-vol-statusd
# Description: Check cciss_vol_status values in the background.
# Required-Start: $remote_fs $syslog # Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog # Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
@ -15,7 +16,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin
DESC="cciss-vol-status monitor" DESC="cciss-vol-status monitor"
NAME="cciss-vol-statusd" NAME=cciss-vol-statusd
PIDFILE=/var/run/$NAME.pid PIDFILE=/var/run/$NAME.pid
STATUSFILE=/var/run/$NAME.status STATUSFILE=/var/run/$NAME.status
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
@ -102,7 +103,12 @@ EOF
echo "Report from $0 on $hostname" echo "Report from $0 on $hostname"
) | mail -s "info: CCISS raid status change on $hostname" $MAILTO ) | mail -s "info: CCISS raid status change on $hostname" $MAILTO
fi fi
sleep $PERIOD sleep $PERIOD &
# Kill sleep if we're signaled to exit, otherwise we will stay defunct
# until sleep terminates.
trap "kill $!; exit" TERM
wait $!
trap - TERM
done done
} }
@ -176,6 +182,10 @@ case "$1" in
check_cciss) check_cciss)
check_cciss check_cciss
;; ;;
status)
status_of_proc /usr/bin/daemon $NAME
exit $?
;;
restart|force-reload) restart|force-reload)
log_begin_msg "Restarting $DESC: $NAME" log_begin_msg "Restarting $DESC: $NAME"
d_stop_by_restart d_stop_by_restart

77
packaging/debian/cciss-vol-status/changelog
View File

@ -1,21 +1,72 @@
cciss-vol-status (1:1.10-1hwraid1) unstable; urgency=low cciss-vol-status (1.12-1+hwraid1) unstable; urgency=medium
* New upstream release. * Use lsb-release to add unique distribution tag in pkgs version.
* Drop allow_short_persnickety_option patch. * Relax debhelper compat from 10 to 5 to support very old distributions.
* Rewrite rules to use regular legacy debhelper.
* Re-add dependency on bsd-mail | mailx.
* Switch source/format to 1.0 and introduce manual quilt for patch mgmt.
* Turn into a periodic service as cciss-vol-statusd based on work done
in mpt-status package.
-- Adam Cécile (Le_Vert) <gandalf@le-vert.net> Tue, 05 Feb 2013 16:55:37 +0100 -- Adam Cecile <acecile@le-vert.net> Wed, 03 Jul 2019 12:44:51 +0200
cciss-vol-status (1:1.09-2hwraid1) unstable; urgency=low cciss-vol-status (1.12-1) unstable; urgency=medium
* Brand new package based on 1.09-2 debian's one. * New upstream version 1.12
* Fully backported to debhelper 5 to keep old releases compatibility. * Remove new-ids patch, upstream has updated their list
* Improved init script by importing fixes from mpt-status 1.2.0-7 package. * Update Standards-Version to 4.0.0
* Add an epoch to be sure it will be installed over debian's official
package (Closes: #90).
* Binary renamed from cciss-vol-status to cciss_vol_status to match
upstream's and Debian's name (Add debian/NEWS).
-- Adam Cécile (Le_Vert) <gandalf@le-vert.net> Tue, 31 Jan 2012 14:31:50 +0100 -- Christian Hofstaedtler <zeha@debian.org> Tue, 11 Jul 2017 10:43:40 +0000
cciss-vol-status (1.11-4) unstable; urgency=medium
* Use https:// in Vcs-* URLs
* Enable hardening=+all
* Update Standards-Version to 3.9.8 (no changes)
-- Christian Hofstaedtler <zeha@debian.org> Sun, 17 Jul 2016 19:53:09 +0000
cciss-vol-status (1.11-3) unstable; urgency=medium
* Moved packaging git to collab-maint
* Set Standards-Version to 3.9.6 (no addtl. changes)
* Update controller names (based on kernel 4.0)
-- Christian Hofstaedtler <zeha@debian.org> Sun, 28 Jun 2015 22:52:09 +0200
cciss-vol-status (1.11-2) unstable; urgency=medium
* Use dh-autoreconf instead of manually running autoreconf
* Update my E-Mail Address
* Refresh patch: fix-manpage
* Add patch: add new PCI IDs
* Bump Standards-Version to 3.9.5 (no further changes)
-- Christian Hofstaedtler <zeha@debian.org> Sat, 05 Jul 2014 21:53:52 +0200
cciss-vol-status (1.11-1) unstable; urgency=low
* New Upstream version 1.11
* Replace 'automake1.11' with 'automake'
* Bump Standards-Version to 3.9.4
-- Christian Hofstaedtler <christian@hofstaedtler.name> Mon, 10 Jun 2013 10:39:58 +0200
cciss-vol-status (1.10-1) unstable; urgency=low
* Imported Upstream version 1.10
* Remove local patch 'device_ids'
* Remove local patch 'allow_short_persnickety_option'
-- Christian Hofstaedtler <christian@hofstaedtler.name> Fri, 24 Aug 2012 13:12:48 +0200
cciss-vol-status (1.09-3) unstable; urgency=low
* Add new hardware IDs for HP G8 servers. (Closes: #680310)
* Bump Standards-Version to 3.9.3.
* Build with debhelper 9, to import dpkg buildflags.
-- Christian Hofstaedtler <christian@hofstaedtler.name> Tue, 24 Jul 2012 23:22:06 +0200
cciss-vol-status (1.09-2) unstable; urgency=low cciss-vol-status (1.09-2) unstable; urgency=low

26
packaging/debian/cciss-vol-status/control
View File

@ -1,17 +1,27 @@
Source: cciss-vol-status Source: cciss-vol-status
Section: admin Section: admin
Priority: extra Priority: optional
Maintainer: Adam Cécile (Le_Vert) <gandalf@le-vert.net> Maintainer: Christian Hofstaedtler <zeha@debian.org>
Build-Depends: debhelper (>= 5), autotools-dev, quilt Build-Depends: autoconf,
Standards-Version: 3.9.2 automake,
debhelper (>= 5),
autotools-dev,
quilt,
lsb-release,
Build-Conflicts: autoconf2.13,
automake1.4
Standards-Version: 4.0.0
Homepage: http://cciss.sourceforge.net/ Homepage: http://cciss.sourceforge.net/
Vcs-Browser: http://github.com/zeha/cciss-vol-status/ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/cciss-vol-status.git/
Vcs-Git: git://github.com/zeha/cciss-vol-status.git Vcs-Git: https://anonscm.debian.org/git/collab-maint/cciss-vol-status.git
DM-Upload-Allowed: yes
Package: cciss-vol-status Package: cciss-vol-status
Architecture: amd64 i386 Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, daemon, bsd-mailx | mailx Depends: ${misc:Depends},
${shlibs:Depends},
lsb-base,
daemon,
bsd-mailx | mailx,
Description: HP SmartArray RAID Volume Status Checker Description: HP SmartArray RAID Volume Status Checker
A RAID monitor for HP SmartArray Controllers, as supported by the "cciss", A RAID monitor for HP SmartArray Controllers, as supported by the "cciss",
"hpsa", "hpahcisr" kernel drivers. "hpsa", "hpahcisr" kernel drivers.

3
packaging/debian/cciss-vol-status/docs Normal file
View File

@ -0,0 +1,3 @@
NEWS
README
debian/README.Debian

2
packaging/debian/cciss-vol-status/gbp.conf Normal file
View File

@ -0,0 +1,2 @@
[DEFAULT]
pristine-tar = True

22
packaging/debian/cciss-vol-status/patches/fix-manpage
View File

@ -1,13 +1,13 @@
Description: man does not understand LD macro Description: man does not understand LD macro
Author: Christian Hofstaedtler <ch+debian-packages@zeha.at> Author: Christian Hofstaedtler <zeha@debian.org>
Forwarded: no Forwarded: no
Last-Update: 2010-02-04 Last-Update: 2010-02-04
Index: cciss-vol-status-1.06/cciss_vol_status.8 Index: cciss-vol-status/cciss_vol_status.8
=================================================================== ===================================================================
--- cciss-vol-status-1.06.orig/cciss_vol_status.8 2010-02-04 19:13:34.302683423 +0000 --- cciss-vol-status.orig/cciss_vol_status.8 2014-06-06 06:18:34.121832596 +0200
+++ cciss-vol-status-1.06/cciss_vol_status.8 2010-02-04 19:14:40.797930573 +0000 +++ cciss-vol-status/cciss_vol_status.8 2014-06-06 06:18:34.117832773 +0200
@@ -101,7 +101,7 @@ @@ -112,7 +112,7 @@
/dev/sg node to use with cciss_vol_status: /dev/sg node to use with cciss_vol_status:
.PP .PP
.nf .nf
@ -16,7 +16,7 @@ Index: cciss-vol-status-1.06/cciss_vol_status.8
wumpus:/home/scameron # ls -l /sys/class/scsi_generic/* wumpus:/home/scameron # ls -l /sys/class/scsi_generic/*
lrwxrwxrwx 1 root root 0 2009-11-18 12:31 /sys/class/scsi_generic/sg0 -> ../../devices/pci0000:00/0000:00:02.0/0000:02:00.0/0000:03:03.0/host0/target0:0:0/0:0:0:0/scsi_generic/sg0 lrwxrwxrwx 1 root root 0 2009-11-18 12:31 /sys/class/scsi_generic/sg0 -> ../../devices/pci0000:00/0000:00:02.0/0000:02:00.0/0000:03:03.0/host0/target0:0:0/0:0:0:0/scsi_generic/sg0
lrwxrwxrwx 1 root root 0 2009-11-18 12:31 /sys/class/scsi_generic/sg1 -> ../../devices/pci0000:00/0000:00:1f.1/host2/target2:0:0/2:0:0:0/scsi_generic/sg1 lrwxrwxrwx 1 root root 0 2009-11-18 12:31 /sys/class/scsi_generic/sg1 -> ../../devices/pci0000:00/0000:00:1f.1/host2/target2:0:0/2:0:0:0/scsi_generic/sg1
@@ -128,7 +128,7 @@ @@ -139,7 +139,7 @@
which corresponds to the HP P800 RAID controller listed in /proc/scsi/scsi. which corresponds to the HP P800 RAID controller listed in /proc/scsi/scsi.
.SH EXAMPLE .SH EXAMPLE
.nf .nf
@ -25,7 +25,7 @@ Index: cciss-vol-status-1.06/cciss_vol_status.8
[root@somehost]# cciss_vol_status -q /dev/cciss/c*d0 [root@somehost]# cciss_vol_status -q /dev/cciss/c*d0
/dev/cciss/c0d0: (Smart Array P800) RAID 0 Volume 0 status: OK. /dev/cciss/c0d0: (Smart Array P800) RAID 0 Volume 0 status: OK.
/dev/cciss/c0d0: (Smart Array P800) RAID 0 Volume 1 status: OK. /dev/cciss/c0d0: (Smart Array P800) RAID 0 Volume 1 status: OK.
@@ -206,7 +206,7 @@ @@ -249,7 +249,7 @@
drive status: drive status:
.PP .PP
.nf .nf
@ -34,7 +34,7 @@ Index: cciss-vol-status-1.06/cciss_vol_status.8
"At least one spare drive designated" "At least one spare drive designated"
"At least one spare drive activated and currently rebuilding" "At least one spare drive activated and currently rebuilding"
"At least one activated on-line spare drive is completely rebuilt on this logical drive" "At least one activated on-line spare drive is completely rebuilt on this logical drive"
@@ -220,7 +220,7 @@ @@ -265,7 +265,7 @@
physical drives, if more than zero, will be reported as: physical drives, if more than zero, will be reported as:
.TP .TP
.nf .nf
@ -43,7 +43,7 @@ Index: cciss-vol-status-1.06/cciss_vol_status.8
"Total of n failed physical drives detected on this logical drive." "Total of n failed physical drives detected on this logical drive."
.DE .DE
.fi .fi
@@ -231,7 +231,7 @@ @@ -286,7 +286,7 @@
power supplies, and temperature are reported as follows: power supplies, and temperature are reported as follows:
.PP .PP
.nf .nf
@ -52,7 +52,7 @@ Index: cciss-vol-status-1.06/cciss_vol_status.8
"Fan failed" "Fan failed"
"Temperature problem" "Temperature problem"
"Door alert" "Door alert"
@@ -265,7 +265,7 @@ @@ -324,7 +324,7 @@
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
.SH "SEE ALSO" .SH "SEE ALSO"
http://cciss.sourceforge.net http://cciss.sourceforge.net
@ -61,7 +61,7 @@ Index: cciss-vol-status-1.06/cciss_vol_status.8
The /dev/cciss/c*d0 device nodes of the cciss driver do double duty. The /dev/cciss/c*d0 device nodes of the cciss driver do double duty.
They serve as an access point to both the RAID controllers, and to the They serve as an access point to both the RAID controllers, and to the
first logical drive of each RAID controller. Notice that a /dev/cciss/c*d0 first logical drive of each RAID controller. Notice that a /dev/cciss/c*d0
@@ -277,4 +277,3 @@ @@ -336,4 +336,3 @@
were statically allocated at compile time, and were in short supply. were statically allocated at compile time, and were in short supply.
Changing this behavior at this point would break lots of userland Changing this behavior at this point would break lots of userland
programs. programs.

80
packaging/debian/cciss-vol-status/patches/new-ids Normal file
View File

@ -0,0 +1,80 @@
Description: Add new PCI IDs and update names
Author: Christian Hofstaedtler <zeha@debian.org>
Forwarded: no
Last-Update: 2014-07-05
Index: cciss-vol-status/cciss_vol_status.c
===================================================================
--- cciss-vol-status.orig/cciss_vol_status.c
+++ cciss-vol-status/cciss_vol_status.c
@@ -139,15 +139,12 @@ struct smartarray_id_t {
{ 0x3223103C, "Smart Array P800", 0, 1},
{ 0x3237103c, "Smart Array E500", 0, 1},
{ 0x323D103C, "Smart Array P700m", 0, 1},
+ /* start of hpsa list */
{ 0x3241103C, "Smart Array P212", 0, 1},
{ 0x3243103C, "Smart Array P410", 0, 1},
{ 0x3245103C, "Smart Array P410i", 0, 1},
{ 0x3247103C, "Smart Array P411", 0, 1},
{ 0x3249103C, "Smart Array P812", 0, 1},
- { 0xe0110e11, "HP MSA500", 1, 0}, /* aka Smart Array CL */
- { 0xe0200e11, "HP MSA500 G2", 1, 0},
- { 0xe0300e11, "HP MSA20", 1, 0},
- { 0x3118103c, "HP B110i", 0, 1},
{ 0x324A103C, "Smart Array P712m", 0, 1},
{ 0x324B103C, "Smart Array P711m", 0, 1},
{ 0x3350103C, "Smart Array P222", 0, 1},
@@ -157,15 +154,44 @@ struct smartarray_id_t {
{ 0x3354103C, "Smart Array P420i", 0, 1},
{ 0x3355103C, "Smart Array P220i", 0, 1},
{ 0x3356103C, "Smart Array P721m", 0, 1},
- { 0x1920103C, "Smart Array", 0, 1},
- { 0x1921103C, "Smart Array", 0, 1},
- { 0x1922103C, "Smart Array", 0, 1},
- { 0x1923103C, "Smart Array", 0, 1},
- { 0x1924103C, "Smart Array", 0, 1},
- { 0x1925103C, "Smart Array", 0, 1},
- { 0x1926103C, "Smart Array", 0, 1},
- { 0x1928103C, "Smart Array", 0, 1},
- { 0x334D103C, "Smart Array P822se", 0, 1},
+ { 0x1920103C, "Smart Array P430i", 0, 1},
+ { 0x1921103C, "Smart Array P830i", 0, 1},
+ { 0x1922103C, "Smart Array P430", 0, 1},
+ { 0x1923103C, "Smart Array P431", 0, 1},
+ { 0x1924103C, "Smart Array P830", 0, 1},
+ { 0x1925103C, "Smart Array P831", 0, 1},
+ { 0x1926103C, "Smart Array P731m", 0, 1},
+ { 0x1928103C, "Smart Array P230i", 0, 1},
+ { 0x1929103C, "Smart Array P530", 0, 1},
+ { 0x192A103C, "Smart Array P531", 0, 1},
+ { 0x21BD103C, "Smart Array P244br", 0, 1},
+ { 0x21BE103C, "Smart Array P741m", 0, 1},
+ { 0x21BF103C, "Smart HBA H240ar", 0, 1},
+ { 0x21C0103C, "Smart Array P440ar", 0, 1},
+ { 0x21C1103C, "Smart Array P840ar", 0, 1},
+ { 0x21C2103C, "Smart Array P440", 0, 1},
+ { 0x21C3103C, "Smart Array P441", 0, 1},
+ { 0x21C4103C, "Smart Array", 0, 1},
+ { 0x21C5103C, "Smart Array P841", 0, 1},
+ { 0x21C6103C, "Smart HBA H244br", 0, 1},
+ { 0x21C7103C, "Smart HBA H240", 0, 1},
+ { 0x21C8103C, "Smart HBA H241", 0, 1},
+ { 0x21C9103C, "Smart Array", 0, 1},
+ { 0x21CA103C, "Smart Array P246br", 0, 1},
+ { 0x21CB103C, "Smart Array P840", 0, 1},
+ { 0x21CC103C, "Smart Array", 0, 1},
+ { 0x21CD103C, "Smart Array", 0, 1},
+ { 0x21CE103C, "Smart HBA", 0, 1},
+ { 0x00761590, "HP Storage P1224 Array Controller", 0, 1}, /* VID = 3PAR */
+ { 0x00871590, "HP Storage P1224e Array Controller", 0, 1},
+ { 0x007D1590, "HP Storage P1228 Array Controller", 0, 1},
+ { 0x00881590, "HP Storage P1228e Array Controller", 0, 1},
+ { 0x333f103c, "HP StorageWorks 1210m Array Controller", 0, 1},
+ /* end of hpsa list */
+ { 0xe0110e11, "HP MSA500", 1, 0}, /* aka Smart Array CL */
+ { 0xe0200e11, "HP MSA500 G2", 1, 0},
+ { 0xe0300e11, "HP MSA20", 1, 0},
+ { 0x3118103c, "HP B110i", 0, 1},
{ 0x00451590, "Dynamic Smart Array B320i", 0, 1},
{ 0x00471590, "Dynamic Smart Array B320i", 0, 1},
{ 0x00481590, "Dynamic Smart Array B120i", 0, 1},

21
packaging/debian/cciss-vol-status/rules
View File

@ -18,6 +18,20 @@ endif
DESTDIR=$(CURDIR)/debian/cciss-vol-status DESTDIR=$(CURDIR)/debian/cciss-vol-status
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# Get version from changelog as well as lsb_release
# to compute unique build version (useful for repo mirroring systems doing file pooling)
PKG_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ')
DIST_NAME := $(shell lsb_release -si)
DIST_RELEASE := $(shell lsb_release -sc)
DIST_VERSION := $(shell lsb_release -sr)
PKG_VERSION_TAG := $(PKG_VERSION)+$(DIST_NAME).$(DIST_RELEASE).$(DIST_VERSION)
SUBSTVARS_BINARY_VERSION := -Vbinary:Version="$(PKG_VERSION_TAG)"
SUBSTVARS_SOURCE_VERSION := -Vsource:Version="$(PKG_VERSION_TAG)"
configure: patch configure: patch
config.status: configure config.status: configure
@ -33,7 +47,7 @@ endif
--bindir=/usr/sbin \ --bindir=/usr/sbin \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
LDFLAGS="-Wl,-z,defs" LDFLAGS="$(LDFLAGS)"
build: build-arch build-indep build: build-arch build-indep
build-indep: build-indep:
@ -62,7 +76,8 @@ binary-arch: build install
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_installchangelogs ChangeLog dh_installchangelogs ChangeLog
dh_installdocs dh_installdocs -XREADME
dh_installexamples
dh_installman dh_installman
dh_installinit --name=cciss-vol-statusd dh_installinit --name=cciss-vol-statusd
dh_link dh_link
@ -71,7 +86,7 @@ binary-arch: build install
dh_fixperms dh_fixperms
dh_installdeb dh_installdeb
dh_shlibdeps dh_shlibdeps
dh_gencontrol dh_gencontrol -- -v"$(PKG_VERSION_TAG)" $(SUBSTVARS_BINARY_VERSION) $(SUBSTVARS_SOURCE_VERSION)
dh_md5sums dh_md5sums
dh_builddeb dh_builddeb