LGTM On Tue, May 3, 2016 at 1:52 PM, 'Brian Foley' via ganeti-devel < [email protected]> wrote:
> These were missed previously when adding OSP_FILESYSTEM support, and > may cause problems if OSP_FILESYSTEM is not compatible with the default > filesystem chosen by mke2fs. > > Thanks to hostingnuggets for reporting and suggesting the fix in #1175. > > Signed-off-by: Brian Foley <[email protected]> > --- > import | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/import b/import > index a69759d..d68978f 100755 > --- a/import > +++ b/import > @@ -41,7 +41,7 @@ else > exit 1 > fi > > -mke2fs -Fjq $filesystem_dev > +mke2fs -Fjqt $OSP_FILESYSTEM $filesystem_dev > root_uuid=$($VOL_ID $filesystem_dev ) > > if [ -n "$swapdev" ]; then > @@ -60,7 +60,7 @@ rm -f $TMPDIR/etc/udev/rules.d/z*_persistent-net.rules > > # Fix /etc/fstab with the new volumes' UUIDs > if [ -e $TMPDIR/etc/fstab ]; then > - ROOT_LINE="UUID=$root_uuid / ext3 defaults 0 1" > + ROOT_LINE="UUID=$root_uuid / $OSP_FILESYSTEM defaults 0 1" > if [ -n "$swapdev" -a -n "$swap_uuid" ]; then > SWAP_LINE="UUID=$swap_uuid swap swap defaults 0 0" > cat $TMPDIR/etc/fstab | \ > -- > 2.8.0.rc3.226.g39d4020 > >
