Skip to content

Commit 009da93

Browse files
iHiroakiKawaiiHiroakiKawai
committed
upgrade debian systemvm to wheezy
New kvm libvirt requres virtio-console (/dev/vport*), so upgrading debian guest base OS to wheezy.
1 parent 3123fe6 commit 009da93

1 file changed

Lines changed: 12 additions & 15 deletions

File tree

‎patches/systemvm/debian/buildsystemvm.sh‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ baseimage() {
5050

5151
mount -o loop,offset=$offset $IMAGELOC $MOUNTPOINT
5252

53-
#debootstrap --variant=minbase --keyring=/usr/share/keyrings/debian-archive-keyring.gpg squeeze $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
54-
debootstrap --variant=minbase --arch=i386 squeeze $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
53+
#debootstrap --variant=minbase --keyring=/usr/share/keyrings/debian-archive-keyring.gpg wheezy $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
54+
debootstrap --variant=minbase --arch=i386 wheezy $MOUNTPOINT http://${APT_PROXY}${DEBIAN_MIRROR}
5555
}
5656

5757

@@ -63,11 +63,14 @@ EOF
6363
fi
6464

6565
cat > etc/apt/sources.list << EOF
66-
deb http://ftp.us.debian.org/debian/ squeeze main contrib non-free
67-
deb-src http://ftp.us.debian.org/debian/ squeeze main contrib non-free
66+
deb http://ftp.us.debian.org/debian/ wheezy main contrib non-free
67+
deb-src http://ftp.us.debian.org/debian/ wheezy main contrib non-free
6868
69-
deb http://security.debian.org/ squeeze/updates main
70-
deb-src http://security.debian.org/ squeeze/updates main
69+
deb http://security.debian.org/ wheezy/updates main
70+
deb-src http://security.debian.org/ wheezy/updates main
71+
72+
deb http://ftp.us.debian.org/debian/ wheezy-backports main
73+
deb-src http://ftp.us.debian.org/debian/ wheezy-backports main
7174
EOF
7275

7376
cat >> etc/apt/apt.conf << EOF
@@ -347,7 +350,7 @@ packages() {
347350
export DEBIAN_FRONTEND DEBIAN_PRIORITY DEBCONF_DB_OVERRIDE
348351

349352
#basic stuff
350-
chroot . apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget python bzip2 sed gawk diff grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
353+
chroot . apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
351354
#fix hostname in openssh-server generated keys
352355
sed -i "s/root@\(.*\)$/root@systemvm/g" etc/ssh/ssh_host_*.pub
353356

@@ -373,14 +376,8 @@ packages() {
373376
#ipcalc
374377
chroot . apt-get --no-install-recommends -q -y --force-yes install ipcalc
375378

376-
echo "***** getting sun jre 6*********"
377-
chroot . echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true
378-
sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true
379-
sun-java6-jre sun-java6-jre/stopthread boolean true
380-
sun-java6-jre sun-java6-jre/jcepolicy note
381-
sun-java6-bin shared/present-sun-dlj-v1-1 note
382-
sun-java6-jre shared/present-sun-dlj-v1-1 note ' | chroot . debconf-set-selections
383-
chroot . apt-get --no-install-recommends -q -y install sun-java6-jre
379+
echo "***** getting jre 7 *********"
380+
chroot . apt-get --no-install-recommends -q -y install openjdk-7-jre-headless
384381
}
385382

386383

0 commit comments

Comments
 (0)