- fix default fs options for reiserfs, fix VM_IMAGE setting if --vm-type is used...

diff --git a/build b/build
index 5122d1e..8a50e08 100755 (executable)
--- a/build
+++ b/build
@@ -69,7 +69,7 @@ VMDISK_ROOTSIZE=4096
 VMDISK_SWAPSIZE=1024
 VMDISK_FILESYSTEM=ext3
 # settings are for speed and not data safety, we format anyway on next run
-VMDISK_MOUNT_OPTIONS='-o data=writeback,nobarrier,commit=150,noatime'
+VMDISK_MOUNT_OPTIONS=__default
 MEMSIZE=
 RUNNING_IN_VM=
 RPMLIST=
@@ -874,7 +874,9 @@ while test -n "$1"; do
        needarg
        VM_TYPE="$ARG"
        case "$VM_TYPE" in
-           xen|kvm|uml|qemu|lxc) ;;
+           xen|kvm|uml|qemu|lxc)
+               test -z "$VM_IMAGE" && VM_IMAGE=1
+               ;;
            none|chroot) VM_TYPE='' ;;
            *)
                echo "VM $VM_TYPE not supported"
@@ -1060,6 +1062,14 @@ if test "$VM_TYPE" = "lxc"; then
     VM_SWAP=''
 fi
 
+if test "$VMDISK_MOUNT_OPTIONS" = __default; then
+    if test "$VMDISK_FILESYSTEM" = reiserfs ; then
+       VMDISK_MOUNT_OPTIONS='-o data=writeback,commit=150,noatime'
+    else
+       VMDISK_MOUNT_OPTIONS='-o data=writeback,nobarrier,commit=150,noatime'
+    fi
+fi
+
 if test -n "$KILL" ; then
     test -z "$SRCDIR" || usage
     if test -n "$VM_IMAGE" -a -n "$VM_SWAP" -a -n "$VM_TYPE"; then

diff --git a/configs/arch.conf b/configs/arch.conf
index d2202c3..2b4b31d 100644 (file)
--- a/configs/arch.conf
+++ b/configs/arch.conf
@@ -5,12 +5,12 @@ Preinstall: gawk gzip filesystem curl acl gpgme libarchive
 Preinstall: openssl libssh2 zlib libassuan libgpg-error attr
 Preinstall: expat xz bzip2
 
-VMinstall: util-linux binutils
+VMinstall: util-linux binutils readline ncurses pcre libcap
 
 Required: binutils gcc glibc libtool
 
 Support: acl autoconf automake zlib bzip2 filesystem curl
 Support: libtool ncurses perl gpgme libarchive openssl libssh2
 Support: libassuan libgpg-error attr expat xz pacman pacman-mirrorlist
-Support: fakeroot file sudo patch make
+Support: fakeroot file sudo patch make net-tools
 

diff --git a/init_buildsystem b/init_buildsystem
index 1a882e6..9fae7c5 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -735,7 +735,7 @@ fi
 #
 # now test if there is already a build dir.
 #
-if test ! -f $BUILD_ROOT/var/lib/rpm/packages.rpm -a ! -f $BUILD_ROOT/var/lib/rpm/Packages ; then
+if test ! -f $BUILD_ROOT/var/lib/rpm/packages.rpm -a ! -f $BUILD_ROOT/var/lib/rpm/Packages -a ! -e $BUILD_ROOT/.build/init_buildsystem.data ; then
     mkdir -p $BUILD_ROOT/var/lib/rpm || cleanup_and_exit 1
     mkdir -p $BUILD_ROOT/usr/src/packages/SOURCES || cleanup_and_exit 1
     mkdir -p $BUILD_ROOT/etc || cleanup_and_exit 1