chiark
/
gitweb
/
~ianmdlvl
/
autopkgtest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finalise changelog
[autopkgtest.git]
/
xen
/
fixups-inside
diff --git
a/xen/fixups-inside
b/xen/fixups-inside
index d35a03d677d5050a98cb722298b7469c705e69da..c69fbd361e3259e64de8587abd792cd715b5f962 100755
(executable)
--- a/
xen/fixups-inside
+++ b/
xen/fixups-inside
@@
-6,6
+6,8
@@
adt_guest_hostname=$2
adt_host_ipaddr=$3
adt_guest_ipaddr=$4
adt_fs_type=$5
adt_host_ipaddr=$3
adt_guest_ipaddr=$4
adt_fs_type=$5
+adt_normaluser=$6
+adt_provideswap=$7
echo '(---'
echo '(---'
@@
-26,6
+28,12
@@
proc /proc proc defaults 0 0
/dev/hda1 / $adt_fs_type defaults,errors=remount-ro 0 1
END
/dev/hda1 / $adt_fs_type defaults,errors=remount-ro 0 1
END
+if $adt_provideswap; then
+ cat >>/etc/fstab <<END
+/dev/hda2 none swap sw 0 0
+END
+fi
+
mkdir -p /etc/network
cat >/etc/network/interfaces <<END
auto lo
mkdir -p /etc/network
cat >/etc/network/interfaces <<END
auto lo
@@
-67,6
+75,6
@@
if [ x"$adt_normaluser" != x ]; then
fi
apt-get update
fi
apt-get update
-apt-get
-y install gdebi-core || apt-get -y install gdebi
+apt-get
install libc6-xen ||:
echo '---)'
echo '---)'