git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'zpool create' segfault due to bad syntax
[zfs.git]
/
scripts
/
common.sh.in
diff --git
a/scripts/common.sh.in
b/scripts/common.sh.in
index
71a6b18
..
3c11820
100644
(file)
--- a/
scripts/common.sh.in
+++ b/
scripts/common.sh.in
@@
-263,7
+263,7
@@
check_loop_utils() {
# Find and return an unused loopback device.
#
unused_loop_device() {
# Find and return an unused loopback device.
#
unused_loop_device() {
- for DEVICE in `ls -1 /dev/loop* 2>/dev/null`; do
+ for DEVICE in `ls -1 /dev/loop
[0-9]
* 2>/dev/null`; do
${LOSETUP} ${DEVICE} &>/dev/null
if [ $? -ne 0 ]; then
echo ${DEVICE}
${LOSETUP} ${DEVICE} &>/dev/null
if [ $? -ne 0 ]; then
echo ${DEVICE}
@@
-342,7
+342,9
@@
format() {
local DEVICE=$1
local FSTYPE=$2
local DEVICE=$1
local FSTYPE=$2
- /sbin/mkfs.${FSTYPE} -q ${DEVICE} || return 1
+ # Force 4K blocksize, else mkfs.ext2 tries to use 8K, which
+ # won't mount
+ /sbin/mkfs.${FSTYPE} -b 4096 -F -q ${DEVICE} || return 1
return 0
}
return 0
}