Changes of Revision 32
| [-] | Changed | _service:set_version:ix-inventory-system.spec |
|
1 2 %define pkgname inventory-system3 Name: ix-inventory-system4 Release: 05 -Version: 0.0.87386 +Version: 0.0.95487 Url: http://www.internetx.com/8 License: GPLv29 Group: System10 |
||
| [+] | Changed | _service:recompress:tar_scm:inventory-system-0.0.9548.tar.bz2/client/inventory-system.sh ^ |
| @@ -1,8 +1,8 @@ #!/usr/bin/env bash # Inventory System # Author: Carsten Schoene -# $LastChangedDate: 2014-07-11 13:23:27 +0200 (Fri, 11 Jul 2014) $ -# $Rev: 8738 $ +# $LastChangedDate: 2014-11-28 14:35:12 +0100 (Fri, 28 Nov 2014) $ +# $Rev: 9548 $ # # Default options (can be changed by inventory-system.conf) DEBUG="yes" @@ -399,6 +399,14 @@ ;; kvm) ROOTDEV=`${READLINK} -f /dev/root` + if [ -z "${ROOTDEV}" ] ; then + if [ -d /dev/disk/by-uuid/ ] ; then + UUID=`${GREP} -E '(^UUID=.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^UUID=(.*)\s/\s.*@\1@'` + ROOTDDEV=`${READLINK} -e $(${LS} -1A /dev/disk/by-uuid/${UUID})` + else + ROOTDEV=`${GREP} -E '(^/dev/.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^(/dev/x?[hsv]d[a-z].*)\s/\s.*@\1@'` + fi + fi if [ "${ROOTDEV}" == "/dev/root" ] ; then # on kvm /dev/root is not always a symlink - ugly hack MAJOR=`${DMSETUP} deps /dev/root | ${AWK} -F": " '{print $2}' | ${AWK} -F, '{print $1}' | ${SED} -e 's@(@@'` @@ -420,6 +428,12 @@ ;; *) ROOTDEV=`${READLINK} -f /dev/root` + if [ -z "${ROOTDEV}" ] ; then + UUID=`${GREP} -E '(^UUID=.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^UUID=(.*)\s/\s.*@\1@'` + ROOTDEV=`${READLINK} -e $(${LS} -1A /dev/disk/by-uuid/${UUID})` + else + ROOTDEV=`${GREP} -E '(^/dev/.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^(/dev/.*)\s/\s.*@\1@'` + fi # HP HP_ROOTDISK=`echo ${ROOTDEV} | ${GREP} "/dev/cciss" | ${SED} -r 's@(/dev/cciss/c[0-9]d[0-9]).*@\1@'` # linux software raid | ||
| [+] | Added | _service:set_version:debian.changelog ^ |
| @@ -0,0 +1,5 @@ +ix-inventory-system (0.0.9548) stable; urgency=low + + * Initial Release + + -- Carsten Schoene <cs@linux-administrator.com> Sun, 06 Oct 2013 15:04:38 +0100 | ||
| [+] | Changed | _service:set_version:ix-inventory-system.dsc ^ |
| @@ -2,7 +2,7 @@ Source: ix-inventory-system Binary: ix-inventory-system Architecture: any -Version: 0.0.8738 +Version: 0.0.9548 Maintainer: Carsten Schoene <cs@linux-administrator.com> Standards-Version: 0.0.1 Build-Depends: cdbs, cmake, debhelper | ||