From f3eb459e3204455531c1eec33bd1b6b444264cf7 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 26 Oct 2012 12:18:57 +1300 Subject: [PATCH 1/3] Turn off udev logging, it makes debugging too hard. Better would be to log to a file or something. --- baremetal-mkinitrd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baremetal-mkinitrd.sh b/baremetal-mkinitrd.sh index 96c297aa..ba45b337 100755 --- a/baremetal-mkinitrd.sh +++ b/baremetal-mkinitrd.sh @@ -81,7 +81,7 @@ mkdir -p "$INITRD_DIR/etc/udev" cat >"$INITRD_DIR/etc/udev/udev.conf" < Date: Fri, 26 Oct 2012 12:19:47 +1300 Subject: [PATCH 2/3] Support KVM instances - allow /dev/vda to be detected as a disk. --- scripts/d/init-func | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/d/init-func b/scripts/d/init-func index 7491767d..e9e4c292 100755 --- a/scripts/d/init-func +++ b/scripts/d/init-func @@ -57,7 +57,7 @@ function prepend_dev() { function whole_disk_name() { local dev=`prepend_dev "$1"` case "$dev" in - /dev/sd*|/dev/hd*) + /dev/sd*|/dev/hd*|/dev/vd*) echo "$dev" | sed -e 's/[0-9]*$//' ;; /dev/cciss/*) @@ -74,7 +74,7 @@ function partition_name() { local dev=`prepend_dev "$1"` local part=$2 case "$dev" in - /dev/sd*|/dev/hd*) + /dev/sd*|/dev/hd*|/dev/vd*) echo "${dev}${part}" ;; /dev/cciss/*) From d87f92cb4f442b142a63175ddaee81644055ae5f Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 26 Oct 2012 12:20:15 +1300 Subject: [PATCH 3/3] Ignore temporary files. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b72f9be2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +*.swp