summaryrefslogtreecommitdiffstats
path: root/tests/guests/guest-aux
diff options
context:
space:
mode:
Diffstat (limited to 'tests/guests/guest-aux')
-rwxr-xr-xtests/guests/guest-aux/make-debian-img.sh10
-rwxr-xr-xtests/guests/guest-aux/make-fedora-img.pl4
-rwxr-xr-xtests/guests/guest-aux/make-ubuntu-img.sh4
-rwxr-xr-xtests/guests/guest-aux/make-windows-img.sh2
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/guests/guest-aux/make-debian-img.sh b/tests/guests/guest-aux/make-debian-img.sh
index 74e9f59c..76d81d39 100755
--- a/tests/guests/guest-aux/make-debian-img.sh
+++ b/tests/guests/guest-aux/make-debian-img.sh
@@ -63,15 +63,15 @@ mkfs ext2 /dev/debian/home blocksize:4096
set-e2uuid /dev/debian/home 01234567-0123-0123-0123-012345678905
# Enough to fool inspection API.
-mount-options "" /dev/debian/root /
+mount /dev/debian/root /
mkdir /boot
-mount-options "" /dev/sda1 /boot
+mount /dev/sda1 /boot
mkdir /usr
-mount-options "" /dev/debian/usr /usr
+mount /dev/debian/usr /usr
mkdir /var
-mount-options "" /dev/debian/var /var
+mount /dev/debian/var /var
mkdir /home
-mount-options "" /dev/debian/home /home
+mount /dev/debian/home /home
mkdir /bin
mkdir /etc
mkdir-p /var/lib/dpkg
diff --git a/tests/guests/guest-aux/make-fedora-img.pl b/tests/guests/guest-aux/make-fedora-img.pl
index 9991b73d..3272d4c7 100755
--- a/tests/guests/guest-aux/make-fedora-img.pl
+++ b/tests/guests/guest-aux/make-fedora-img.pl
@@ -135,9 +135,9 @@ $g->set_label ('/dev/VG/Root', 'ROOT');
$g->set_e2uuid ('/dev/VG/Root', '01234567-0123-0123-0123-012345678902');
# Enough to fool inspection API.
-$g->mount_options ('', '/dev/VG/Root', '/');
+$g->mount ('/dev/VG/Root', '/');
$g->mkdir ('/boot');
-$g->mount_options ('', $bootdev, '/boot');
+$g->mount ($bootdev, '/boot');
$g->mkdir ('/bin');
$g->mkdir ('/etc');
$g->mkdir ('/etc/sysconfig');
diff --git a/tests/guests/guest-aux/make-ubuntu-img.sh b/tests/guests/guest-aux/make-ubuntu-img.sh
index 50bae439..eec80f91 100755
--- a/tests/guests/guest-aux/make-ubuntu-img.sh
+++ b/tests/guests/guest-aux/make-ubuntu-img.sh
@@ -58,9 +58,9 @@ mkfs ext2 /dev/sda2 blocksize:4096
set-e2uuid /dev/sda2 01234567-0123-0123-0123-012345678902
# Enough to fool inspection API.
-mount-options "" /dev/sda2 /
+mount /dev/sda2 /
mkdir /boot
-mount-options "" /dev/sda1 /boot
+mount /dev/sda1 /boot
mkdir /bin
mkdir /etc
mkdir /home
diff --git a/tests/guests/guest-aux/make-windows-img.sh b/tests/guests/guest-aux/make-windows-img.sh
index 521fde2c..860ec060 100755
--- a/tests/guests/guest-aux/make-windows-img.sh
+++ b/tests/guests/guest-aux/make-windows-img.sh
@@ -55,7 +55,7 @@ mkfs ntfs /dev/sda1
mkfs ntfs /dev/sda2
# Enough to fool inspection API.
-mount-options "" /dev/sda2 /
+mount /dev/sda2 /
mkdir-p /Windows/System32/Config
upload $SRCDIR/guest-aux/windows-software /Windows/System32/Config/SOFTWARE