|
@@ -15,20 +15,20 @@ if [ "$(uname -s)" = "Darwin" ]; then
|
|
export PATH="/usr/local/opt/e2fsprogs/sbin:$PATH"
|
|
export PATH="/usr/local/opt/e2fsprogs/sbin:$PATH"
|
|
fi
|
|
fi
|
|
echo "setting up disk image..."
|
|
echo "setting up disk image..."
|
|
-qemu-img create _disk_image "${DISK_SIZE:-600}"m || die "couldn't create disk image"
|
|
|
|
-chown "$SUDO_UID":"$SUDO_GID" _disk_image || die "couldn't adjust permissions on disk image"
|
|
|
|
|
|
+qemu-img create _disk_image "${DISK_SIZE:-600}"m || die "could not create disk image"
|
|
|
|
+chown "$SUDO_UID":"$SUDO_GID" _disk_image || die "could not adjust permissions on disk image"
|
|
echo "done"
|
|
echo "done"
|
|
|
|
|
|
printf "creating new filesystem... "
|
|
printf "creating new filesystem... "
|
|
if [ "$(uname -s)" = "OpenBSD" ]; then
|
|
if [ "$(uname -s)" = "OpenBSD" ]; then
|
|
- VND=`vnconfig _disk_image`
|
|
|
|
- (echo "e 0"; echo 83; echo n; echo 0; echo "*"; echo "quit") | fdisk -e $VND
|
|
|
|
- mkfs.ext2 -I 128 -F /dev/${VND}i || die "couldn't create filesystem"
|
|
|
|
|
|
+ VND=$(vnconfig _disk_image)
|
|
|
|
+ (echo "e 0"; echo 83; echo n; echo 0; echo "*"; echo "quit") | fdisk -e "$VND"
|
|
|
|
+ mkfs.ext2 -I 128 -F "/dev/${VND}i" || die "could not create filesystem"
|
|
else
|
|
else
|
|
if [ -x /sbin/mke2fs ]; then
|
|
if [ -x /sbin/mke2fs ]; then
|
|
- /sbin/mke2fs -q -I 128 _disk_image || die "couldn't create filesystem"
|
|
|
|
|
|
+ /sbin/mke2fs -q -I 128 _disk_image || die "could not create filesystem"
|
|
else
|
|
else
|
|
- mke2fs -q -I 128 _disk_image || die "couldn't create filesystem"
|
|
|
|
|
|
+ mke2fs -q -I 128 _disk_image || die "could not create filesystem"
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
echo "done"
|
|
echo "done"
|
|
@@ -36,11 +36,11 @@ echo "done"
|
|
printf "mounting filesystem... "
|
|
printf "mounting filesystem... "
|
|
mkdir -p mnt
|
|
mkdir -p mnt
|
|
if [ "$(uname -s)" = "Darwin" ]; then
|
|
if [ "$(uname -s)" = "Darwin" ]; then
|
|
- fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20 || die "couldn't mount filesystem"
|
|
|
|
|
|
+ fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20 || die "could not mount filesystem"
|
|
elif [ "$(uname -s)" = "OpenBSD" ]; then
|
|
elif [ "$(uname -s)" = "OpenBSD" ]; then
|
|
- mount -t ext2fs /dev/${VND}i mnt/ || die "couldn't mount filesystem"
|
|
|
|
|
|
+ mount -t ext2fs "/dev/${VND}i" mnt/ || die "could not mount filesystem"
|
|
else
|
|
else
|
|
- mount _disk_image mnt/ || die "couldn't mount filesystem"
|
|
|
|
|
|
+ mount _disk_image mnt/ || die "could not mount filesystem"
|
|
fi
|
|
fi
|
|
echo "done"
|
|
echo "done"
|
|
|
|
|
|
@@ -50,7 +50,7 @@ cleanup() {
|
|
umount mnt || ( sleep 1 && sync && umount mnt )
|
|
umount mnt || ( sleep 1 && sync && umount mnt )
|
|
rm -rf mnt
|
|
rm -rf mnt
|
|
if [ "$(uname -s)" = "OpenBSD" ]; then
|
|
if [ "$(uname -s)" = "OpenBSD" ]; then
|
|
- vnconfig -u $VND
|
|
|
|
|
|
+ vnconfig -u "$VND"
|
|
fi
|
|
fi
|
|
echo "done"
|
|
echo "done"
|
|
fi
|
|
fi
|