projects
/
gnt-info
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d4ea81
)
drbd should catch all unknown devices (e.g. rbd)
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Fri, 5 Oct 2018 07:23:31 +0000
(09:23 +0200)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sun, 7 Oct 2018 09:04:12 +0000
(11:04 +0200)
hooks/grub
patch
|
blob
|
history
diff --git
a/hooks/grub
b/hooks/grub
index
022f8f3
..
b6b7837
100755
(executable)
--- a/
hooks/grub
+++ b/
hooks/grub
@@
-6,6
+6,8
@@
# Do not include grub in EXTRA_PKGS of
# $sysconfdir/default/ganeti-instance-debootstrap because it will
# cause error of debootstrap.
# Do not include grub in EXTRA_PKGS of
# $sysconfdir/default/ganeti-instance-debootstrap because it will
# cause error of debootstrap.
+#
+# based on https://groups.google.com/forum/#!searchin/ganeti/debootstrap|sort:date/ganeti/N8_r8lKoA-k/8ExYRnPUAQAJ
set -e
set -e
@@
-31,7
+33,8
@@
elif dmsetup info $BLOCKDEV > /dev/null 2>&1; then
DISKTYPE=lvm
else
echo "Unknown disk type"
DISKTYPE=lvm
else
echo "Unknown disk type"
- exit 1
+ #exit 1
+ DISKTYPE=unknown
fi
mount -o bind /dev $TARGET/dev
fi
mount -o bind /dev $TARGET/dev
@@
-70,7
+73,7
@@
case $DISKTYPE in
echo "(hd0) $MAPPERDEV" > $TARGET/boot/grub/device.map
chroot "$TARGET" grub-install $LODEV
;;
echo "(hd0) $MAPPERDEV" > $TARGET/boot/grub/device.map
chroot "$TARGET" grub-install $LODEV
;;
-
drbd
)
+
*
)
chroot "$TARGET" grub-install $BLOCKDEV
;;
esac
chroot "$TARGET" grub-install $BLOCKDEV
;;
esac
@@
-88,7
+91,7
@@
case $DISKTYPE in
lvm)
chroot "$TARGET" grub-install $LODEV
;;
lvm)
chroot "$TARGET" grub-install $LODEV
;;
-
drbd
)
+
*
)
chroot "$TARGET" grub-install $BLOCKDEV
;;
esac
chroot "$TARGET" grub-install $BLOCKDEV
;;
esac