Merge pull request #1 from tripleo/tripleo

A few cleanups
This commit is contained in:
NTTdocomo-openstack 2012-10-25 22:49:56 -07:00
commit 10b9c660d6
3 changed files with 5 additions and 3 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*~
*.swp

View File

@ -81,7 +81,7 @@ mkdir -p "$INITRD_DIR/etc/udev"
cat >"$INITRD_DIR/etc/udev/udev.conf" <<EOF cat >"$INITRD_DIR/etc/udev/udev.conf" <<EOF
udev_root="/dev" udev_root="/dev"
udev_rules="/lib/udev/rules.d" udev_rules="/lib/udev/rules.d"
udev_log="info" udev_log="no"
EOF EOF
libs= libs=

View File

@ -57,7 +57,7 @@ function prepend_dev() {
function whole_disk_name() { function whole_disk_name() {
local dev=`prepend_dev "$1"` local dev=`prepend_dev "$1"`
case "$dev" in case "$dev" in
/dev/sd*|/dev/hd*) /dev/sd*|/dev/hd*|/dev/vd*)
echo "$dev" | sed -e 's/[0-9]*$//' echo "$dev" | sed -e 's/[0-9]*$//'
;; ;;
/dev/cciss/*) /dev/cciss/*)
@ -74,7 +74,7 @@ function partition_name() {
local dev=`prepend_dev "$1"` local dev=`prepend_dev "$1"`
local part=$2 local part=$2
case "$dev" in case "$dev" in
/dev/sd*|/dev/hd*) /dev/sd*|/dev/hd*|/dev/vd*)
echo "${dev}${part}" echo "${dev}${part}"
;; ;;
/dev/cciss/*) /dev/cciss/*)