Compare commits
1 Commits
domaindir
...
debian-3.9
| Author | SHA1 | Date | |
|---|---|---|---|
|
aba8e1b411 |
11
.gitignore
vendored
11
.gitignore
vendored
@@ -1,11 +0,0 @@
|
|||||||
.hg
|
|
||||||
.hgtags
|
|
||||||
ChangeLog
|
|
||||||
*~
|
|
||||||
build-stamp
|
|
||||||
configure-stamp
|
|
||||||
man
|
|
||||||
debian/files
|
|
||||||
debian/xen-tools
|
|
||||||
debian/xen-tools.debhelper.log
|
|
||||||
debian/xen-tools.substvars
|
|
||||||
2
.hgtags
2
.hgtags
@@ -1,2 +0,0 @@
|
|||||||
d75c787add2a7ceb19b30b018d4d16b7317c772d release-4.
|
|
||||||
6a10240d7c66e2f7df56457708efb9287640bcf4 release-4.1
|
|
||||||
21
AUTHORS
21
AUTHORS
@@ -1,10 +1,8 @@
|
|||||||
|
|
||||||
|
|
||||||
Primary Authors
|
Primary Author
|
||||||
---------------
|
--------------
|
||||||
|
|
||||||
Axel Beckert <abe@deuxchevaux.org>
|
|
||||||
Dmitry Nedospasov <dmitry@nedos.net>
|
|
||||||
Steve Kemp <steve [at] uk.org.steve>
|
Steve Kemp <steve [at] uk.org.steve>
|
||||||
|
|
||||||
|
|
||||||
@@ -13,7 +11,7 @@ Contributions
|
|||||||
|
|
||||||
Listed alphabetically by surname.
|
Listed alphabetically by surname.
|
||||||
|
|
||||||
C.J. Adams-Collier <cjcollier [at] com.gmail>
|
C.J. Adams-Collier <cjcollier [at] com.gmail.com
|
||||||
- Added new modular structure to the code.
|
- Added new modular structure to the code.
|
||||||
|
|
||||||
Nick Anderson <nick [at] net.anders0n>
|
Nick Anderson <nick [at] net.anders0n>
|
||||||
@@ -53,22 +51,12 @@ Contributions
|
|||||||
Gordon Messmer <gmessmer [at] edu.washington.u>
|
Gordon Messmer <gmessmer [at] edu.washington.u>
|
||||||
- Supplied .spec file for building .rpm packages.
|
- Supplied .spec file for building .rpm packages.
|
||||||
|
|
||||||
Wilson Neil <neil [at] uk.co.aldur>
|
|
||||||
- Several suggestions and code for disabling start-stop-daemon
|
|
||||||
- Compatibility fixups for Ubuntu.
|
|
||||||
|
|
||||||
Nathan O'Sullivan <nathan [at] au.com.mammoth>
|
|
||||||
- New features wrt. options and helper functions
|
|
||||||
|
|
||||||
Walter Reiner <walter [at] at.wreiner>
|
Walter Reiner <walter [at] at.wreiner>
|
||||||
- Provided --image-dev + --swap-dev patch.
|
- Provided --image-dev + --swap-dev patch.
|
||||||
|
|
||||||
Jameson Rollins <jrollins [at] edu.columbia.phys>
|
Jameson Rollins <jrollins [at] edu.columbia.phys>
|
||||||
- Provided --output + --extension code.
|
- Provided --output + --extension code.
|
||||||
|
|
||||||
Michal Safranek (Wejn) <wejn [at] box.cz>
|
|
||||||
- Inspiration for pygrub in the install-kernel scripts
|
|
||||||
|
|
||||||
Felipe Scarel <fbscarel [at] com.gmail>
|
Felipe Scarel <fbscarel [at] com.gmail>
|
||||||
- Bugfix for --no-swap + LVM
|
- Bugfix for --no-swap + LVM
|
||||||
|
|
||||||
@@ -88,3 +76,6 @@ Contributions
|
|||||||
Ward Vandewege <ward [at] be.pong>
|
Ward Vandewege <ward [at] be.pong>
|
||||||
- Made several updates for Ubuntu support.
|
- Made several updates for Ubuntu support.
|
||||||
|
|
||||||
|
Wilson Neil <neil [at] uk.co.aldur>
|
||||||
|
- Several suggestions and code for disabling start-stop-daemon
|
||||||
|
- Compatibility fixups for Ubuntu.
|
||||||
|
|||||||
80
Makefile
80
Makefile
@@ -12,14 +12,10 @@
|
|||||||
#
|
#
|
||||||
# Only used to build distribution tarballs.
|
# Only used to build distribution tarballs.
|
||||||
#
|
#
|
||||||
TMP ?= /tmp
|
|
||||||
DIST_PREFIX = ${TMP}
|
DIST_PREFIX = ${TMP}
|
||||||
VERSION = 4.2rc1
|
VERSION = 3.9
|
||||||
DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
|
|
||||||
BASE = xen-tools
|
BASE = xen-tools
|
||||||
VCS = $(shell if git st > /dev/null; then echo git; \
|
|
||||||
elif hg st > /dev/null; then echo hg; \
|
|
||||||
else echo cannot-determine-used-vcs; fi)
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Installation prefix, useful for the Debian package.
|
# Installation prefix, useful for the Debian package.
|
||||||
@@ -46,7 +42,7 @@ nop:
|
|||||||
# with those details.
|
# with those details.
|
||||||
#
|
#
|
||||||
changelog:
|
changelog:
|
||||||
$(VCS) log -v > ChangeLog
|
hg log -v > ChangeLog
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -60,8 +56,7 @@ clean:
|
|||||||
@find . -name '*.tmp' -exec rm \{\} \;
|
@find . -name '*.tmp' -exec rm \{\} \;
|
||||||
@find . -name 'tags' -exec rm \{\} \;
|
@find . -name 'tags' -exec rm \{\} \;
|
||||||
@find . -name '*.8.gz' -exec rm \{\} \;
|
@find . -name '*.8.gz' -exec rm \{\} \;
|
||||||
@find . -name '*.tdy' -exec rm \{\} \;
|
@find man -name '*.html' -exec rm \{\} \;
|
||||||
@if [ -d man ]; then rm -rf man ; fi
|
|
||||||
@if [ -e build-stamp ]; then rm -f build-stamp ; fi
|
@if [ -e build-stamp ]; then rm -f build-stamp ; fi
|
||||||
@if [ -e configure-stamp ]; then rm -f configure-stamp ; fi
|
@if [ -e configure-stamp ]; then rm -f configure-stamp ; fi
|
||||||
@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
|
@if [ -d debian/xen-tools ]; then rm -rf ./debian/xen-tools; fi
|
||||||
@@ -73,14 +68,14 @@ clean:
|
|||||||
# If the testsuite runs correctly then commit any pending changes.
|
# If the testsuite runs correctly then commit any pending changes.
|
||||||
#
|
#
|
||||||
commit: test
|
commit: test
|
||||||
$(VCS) commit
|
hg commit
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Show what has been changed in the local copy vs. the remote repository.
|
# Show what has been changed in the local copy vs. the remote repository.
|
||||||
#
|
#
|
||||||
diff:
|
diff:
|
||||||
$(VCS) diff 2>/dev/null
|
hg diff 2>/dev/null
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -92,7 +87,7 @@ fixup-perms:
|
|||||||
chmod 644 etc/xen-tools.conf
|
chmod 644 etc/xen-tools.conf
|
||||||
chmod 644 etc/xm.tmpl
|
chmod 644 etc/xm.tmpl
|
||||||
chmod 644 etc/xm-nfs.tmpl
|
chmod 644 etc/xm-nfs.tmpl
|
||||||
chmod 644 misc/xen-tools misc/README
|
chmod 644 misc/xm misc/xen-tools misc/README
|
||||||
|
|
||||||
#
|
#
|
||||||
# Install files to /etc/
|
# Install files to /etc/
|
||||||
@@ -109,6 +104,7 @@ install-etc:
|
|||||||
cp partitions/*-* ${prefix}/etc/xen-tools/partitions.d/
|
cp partitions/*-* ${prefix}/etc/xen-tools/partitions.d/
|
||||||
-mkdir -p ${prefix}/etc/bash_completion.d
|
-mkdir -p ${prefix}/etc/bash_completion.d
|
||||||
cp misc/xen-tools ${prefix}/etc/bash_completion.d/
|
cp misc/xen-tools ${prefix}/etc/bash_completion.d/
|
||||||
|
cp misc/xm ${prefix}/etc/bash_completion.d/
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -124,7 +120,6 @@ install-bin:
|
|||||||
cp bin/xen-delete-image ${prefix}/usr/bin
|
cp bin/xen-delete-image ${prefix}/usr/bin
|
||||||
cp bin/xen-list-images ${prefix}/usr/bin
|
cp bin/xen-list-images ${prefix}/usr/bin
|
||||||
cp bin/xen-update-image ${prefix}/usr/bin
|
cp bin/xen-update-image ${prefix}/usr/bin
|
||||||
cp bin/xt-guess-suite-and-mirror ${prefix}/usr/bin
|
|
||||||
chmod 755 ${prefix}/usr/bin/xen-create-image
|
chmod 755 ${prefix}/usr/bin/xen-create-image
|
||||||
chmod 755 ${prefix}/usr/bin/xen-create-nfs
|
chmod 755 ${prefix}/usr/bin/xen-create-nfs
|
||||||
chmod 755 ${prefix}/usr/bin/xt-customize-image
|
chmod 755 ${prefix}/usr/bin/xt-customize-image
|
||||||
@@ -133,7 +128,6 @@ install-bin:
|
|||||||
chmod 755 ${prefix}/usr/bin/xen-delete-image
|
chmod 755 ${prefix}/usr/bin/xen-delete-image
|
||||||
chmod 755 ${prefix}/usr/bin/xen-list-images
|
chmod 755 ${prefix}/usr/bin/xen-list-images
|
||||||
chmod 755 ${prefix}/usr/bin/xen-update-image
|
chmod 755 ${prefix}/usr/bin/xen-update-image
|
||||||
chmod 755 ${prefix}/usr/bin/xt-guess-suite-and-mirror
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -152,36 +146,24 @@ install-hooks:
|
|||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
|
|
||||||
mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
|
mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
|
||||||
cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
|
cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d etch.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d
|
|
||||||
mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
|
mkdir -p ${prefix}/usr/lib/xen-tools/gentoo.d/
|
||||||
cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
|
cp -R hooks/gentoo/*-* ${prefix}/usr/lib/xen-tools/gentoo.d
|
||||||
|
mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
|
||||||
|
cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
|
||||||
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
|
||||||
|
-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
|
||||||
mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
|
mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
|
||||||
cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
|
cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
|
||||||
mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
|
mkdir -p ${prefix}/usr/lib/xen-tools/edgy.d/
|
||||||
cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
|
cp -R hooks/edgy/*-* ${prefix}/usr/lib/xen-tools/edgy.d/
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d feisty.d
|
mkdir -p ${prefix}/usr/lib/xen-tools/dapper.d/
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d gutsy.d
|
cp -R hooks/dapper/*-* ${prefix}/usr/lib/xen-tools/dapper.d/
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s edgy.d hardy.d
|
|
||||||
mkdir -p ${prefix}/usr/lib/xen-tools/intrepid.d/
|
|
||||||
cp -R hooks/intrepid/*-* ${prefix}/usr/lib/xen-tools/intrepid.d/
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s intrepid.d jaunty.d
|
|
||||||
mkdir -p ${prefix}/usr/lib/xen-tools/karmic.d/
|
|
||||||
cp -R hooks/karmic/*-* ${prefix}/usr/lib/xen-tools/karmic.d/
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
|
|
||||||
-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
|
|
||||||
cp hooks/common.sh ${prefix}/usr/lib/xen-tools
|
cp hooks/common.sh ${prefix}/usr/lib/xen-tools
|
||||||
|
|
||||||
|
|
||||||
@@ -211,34 +193,25 @@ install: fixup-perms install-bin install-etc install-hooks install-libraries ins
|
|||||||
# Build our manpages via the `pod2man` command.
|
# Build our manpages via the `pod2man` command.
|
||||||
#
|
#
|
||||||
manpages:
|
manpages:
|
||||||
-mkdir -p man
|
cd bin; for i in *-*; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
|
||||||
cd bin; for i in *-*[!y]; do pod2man --release=${VERSION} --official --section=8 $$i ../man/$$i.8; done
|
|
||||||
for i in man/*.8; do gzip --force -9 $$i; done
|
for i in man/*.8; do gzip --force -9 $$i; done
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Make a new release tarball, and make a GPG signature.
|
# Make a new release tarball, and make a GPG signature.
|
||||||
#
|
#
|
||||||
release: tidy fixup-perms update-version update-modules clean changelog
|
release: fixup-perms update-version update-modules clean changelog
|
||||||
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
|
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
|
||||||
rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz
|
rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz
|
||||||
cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
|
cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
|
||||||
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
|
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
|
||||||
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg*
|
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.hg*
|
||||||
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git*
|
|
||||||
cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
|
cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
|
||||||
gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
|
gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
|
||||||
mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz .
|
mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz .
|
||||||
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
|
rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
|
||||||
gpg --armour --detach-sign $(BASE)-$(VERSION).tar.gz
|
gpg --armour --detach-sign $(BASE)-$(VERSION).tar.gz
|
||||||
|
|
||||||
#
|
|
||||||
# Make a new orig.tar.gz for the Debian package
|
|
||||||
#
|
|
||||||
orig-tar-gz: release
|
|
||||||
mv $(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
|
|
||||||
mv $(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Run the test suite.
|
# Run the test suite.
|
||||||
@@ -255,17 +228,6 @@ test-verbose:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Run our main script(s) through perltidy
|
|
||||||
#
|
|
||||||
tidy:
|
|
||||||
if [ -x /usr/bin/perltidy ]; then \
|
|
||||||
for i in bin/*-*[^~]; do \
|
|
||||||
echo "tidying $$i"; \
|
|
||||||
perltidy $$i \
|
|
||||||
; done \
|
|
||||||
; fi
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Uninstall the software, completely.
|
# Uninstall the software, completely.
|
||||||
#
|
#
|
||||||
@@ -278,12 +240,12 @@ uninstall:
|
|||||||
rm -f ${prefix}/usr/bin/xt-install-image
|
rm -f ${prefix}/usr/bin/xt-install-image
|
||||||
rm -f ${prefix}/usr/bin/xt-create-xen-config
|
rm -f ${prefix}/usr/bin/xt-create-xen-config
|
||||||
rm -f ${prefix}/usr/bin/xen-create-nfs
|
rm -f ${prefix}/usr/bin/xen-create-nfs
|
||||||
rm -f ${prefix}/usr/bin/xt-guess-suite-and-mirror
|
|
||||||
rm -f ${prefix}/etc/xen-tools/xen-tools.conf
|
rm -f ${prefix}/etc/xen-tools/xen-tools.conf
|
||||||
rm -f ${prefix}/etc/xen-tools/xm.tmpl
|
rm -f ${prefix}/etc/xen-tools/xm.tmpl
|
||||||
-rm -rf ${prefix}/etc/xen-tools/skel
|
-rm -rf ${prefix}/etc/xen-tools/skel
|
||||||
-rmdir ${prefix}/etc/xen-tools/
|
-rmdir ${prefix}/etc/xen-tools/
|
||||||
-rm -f ${prefix}/etc/bash_completion.d/xen-tools
|
-rm -f ${prefix}/etc/bash_completion.d/xen-tools
|
||||||
|
-rm -f ${prefix}/etc/bash_completion.d/xm
|
||||||
rm -rf ${prefix}/usr/lib/xen-tools
|
rm -rf ${prefix}/usr/lib/xen-tools
|
||||||
rm -f ${prefix}/usr/share/man/man8/xen-create-image.8.gz
|
rm -f ${prefix}/usr/share/man/man8/xen-create-image.8.gz
|
||||||
rm -f ${prefix}/usr/share/man/man8/xen-delete-image.8.gz
|
rm -f ${prefix}/usr/share/man/man8/xen-delete-image.8.gz
|
||||||
@@ -296,8 +258,8 @@ uninstall:
|
|||||||
#
|
#
|
||||||
# NOTE: Removes empty local directories.
|
# NOTE: Removes empty local directories.
|
||||||
#
|
#
|
||||||
update:
|
update:
|
||||||
$(VCS) pull --update 2>/dev/null
|
hg pull --update 2>/dev/null
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -313,4 +275,4 @@ update-modules:
|
|||||||
# at the top of this file. Steve-Specific?
|
# at the top of this file. Steve-Specific?
|
||||||
#
|
#
|
||||||
update-version:
|
update-version:
|
||||||
perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9][^']*';/RELEASE = '${VERSION}';/g" bin/*-*[^~]
|
perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9]';/RELEASE = '${VERSION}';/g" bin/*-*
|
||||||
|
|||||||
59
README
59
README
@@ -2,8 +2,8 @@
|
|||||||
Homepage:
|
Homepage:
|
||||||
http://www.xen-tools.org/software/xen-tools
|
http://www.xen-tools.org/software/xen-tools
|
||||||
|
|
||||||
Git Repository:
|
Mercurial Repository:
|
||||||
http://gitorious.org/xen-tools
|
http://xen-tools.repository.steve.org.uk/
|
||||||
|
|
||||||
Mailing Lists:
|
Mailing Lists:
|
||||||
http://xen-tools.org/software/xen-tools/lists.html
|
http://xen-tools.org/software/xen-tools/lists.html
|
||||||
@@ -20,45 +20,11 @@ xen-tools
|
|||||||
to be accessible over your local network and complete with an installed
|
to be accessible over your local network and complete with an installed
|
||||||
copy of OpenSSH.
|
copy of OpenSSH.
|
||||||
|
|
||||||
xen-tools currently has scripts to install most releases of Debian
|
This software is primarily aimed at users who wish to create virtual
|
||||||
(starting with 3.1 "Sarge") and Ubuntu (starting with 6.06 LTS
|
instances of Debian Sarge, Etch, or Sid. Although other distributions
|
||||||
"Dapper") and some RPM-based distributions.
|
such as Ubuntu Dapper, Edgy, and Feisty are supported if you have the
|
||||||
|
appropriate packages installed.
|
||||||
|
|
||||||
However currently only Debian and Ubuntu releases are tested and
|
|
||||||
known to work, i.e.:
|
|
||||||
|
|
||||||
Debian:
|
|
||||||
* Sarge 3.1 (i386 only)
|
|
||||||
* Etch 4.0
|
|
||||||
* Lenny 5.0
|
|
||||||
* Squeeze 6.0
|
|
||||||
* Sid (works at least at the moment of writing :-)
|
|
||||||
|
|
||||||
Ubuntu:
|
|
||||||
* Dapper Drake 6.06
|
|
||||||
* Edgy Eft 6.10
|
|
||||||
* Feisty Fawn 7.04
|
|
||||||
* Gutsy Gibbon 7.10
|
|
||||||
* Hardy Heron 8.04 (see [1])
|
|
||||||
* Interpid Ibex 8.10
|
|
||||||
* Jaunty Jackaplope 9.04
|
|
||||||
* Karmic Koala 9.10
|
|
||||||
* Lucid Lynx 10.04 (see [2])
|
|
||||||
* Maverick Meerkat 10.10 (works at least at the moment of writing :-)
|
|
||||||
|
|
||||||
[1] There is an issue with debootstrap on hardy not installing ksyslogd
|
|
||||||
This can be fixed by chrooting into the newly installed system
|
|
||||||
and removing the startup scripts. See:
|
|
||||||
http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
|
|
||||||
|
|
||||||
[2] As of writing this 24.04.10, there is an issue with tar on
|
|
||||||
Lucid with kernels < 2.6.22 this should however be patched right
|
|
||||||
after release. See:
|
|
||||||
https://bugs.launchpad.net/ubuntu/+source/tar/+bug/539814
|
|
||||||
|
|
||||||
Older versions of ubuntu may work, however you will have to have to find
|
|
||||||
a mirror that still hosts them. Currently the oldest Ubuntu Distribution
|
|
||||||
on Canonical's archive.ubuntu.com is Hardy Heron.
|
|
||||||
|
|
||||||
Requirements
|
Requirements
|
||||||
------------
|
------------
|
||||||
@@ -71,11 +37,18 @@ Requirements
|
|||||||
* The Perl module "Config::IniFiles"
|
* The Perl module "Config::IniFiles"
|
||||||
- Both of these modules are available as Debian packages,
|
- Both of these modules are available as Debian packages,
|
||||||
or direct from http://www.cpan.org/ for non-Debian distributions.
|
or direct from http://www.cpan.org/ for non-Debian distributions.
|
||||||
* Make, if you are not installing through a package manager
|
|
||||||
|
|
||||||
You can try to install RPM-based distributions such as CentOS, or
|
|
||||||
|
In order to install RPM-based distributions such as CentOS, or
|
||||||
Fedora Core you will need a correctly installed and configured
|
Fedora Core you will need a correctly installed and configured
|
||||||
"rinse" package. This is currently not supported.
|
"rinse" package.
|
||||||
|
|
||||||
|
To install Ubuntu distributions upon a Debian host system you will
|
||||||
|
need either:
|
||||||
|
|
||||||
|
* The Ubuntu version of debootstrap installed.
|
||||||
|
* A patched debootstrap package from:
|
||||||
|
http://steve.org.uk/Software/tmp/debootstrap/
|
||||||
|
|
||||||
If you wish to create new Xen instances which may be controlled by
|
If you wish to create new Xen instances which may be controlled by
|
||||||
users via a login shell you should also install the xen-shell package
|
users via a login shell you should also install the xen-shell package
|
||||||
|
|||||||
165
TODO
165
TODO
@@ -1,161 +1,16 @@
|
|||||||
TODO
|
TODO
|
||||||
====
|
----
|
||||||
|
|
||||||
Bugs to fix and Features to add before a 4.2 release
|
1. Test and support more file system types. Actually this should be
|
||||||
----------------------------------------------------
|
pretty simple now that the parameters are stored in the configuration
|
||||||
|
hash. The only issue is that trailing whitespace is missing from the
|
||||||
|
"make_fs_foo" option.
|
||||||
|
|
||||||
* xen-create-image man page overhaul:
|
2. Write more test cases.
|
||||||
|
|
||||||
- ambiguous option list with regards to parameters
|
3. LVM snapshot support as an install source.
|
||||||
|
|
||||||
* Interactive Password Handling (maybe also the passwd role)
|
4. xen-delete-image should unallocate any used IP addresses.
|
||||||
|
|
||||||
Shouldn't give up after only one password missmatch. This is just
|
Steve
|
||||||
a mater of wrapping the passwd call in a loop.
|
--
|
||||||
|
|
||||||
* Fix 70-install-ssh
|
|
||||||
|
|
||||||
Currently 70-install-ssh fails to finish installing the ssh-server
|
|
||||||
because it does not have a random seed to generate the host keys.
|
|
||||||
Mounting /proc and /dev in chroot prior to calling the install
|
|
||||||
function should fix this. If ssh-server is successfully installed
|
|
||||||
in the domU, it's key fingerprint should be echo'd in a way that
|
|
||||||
can easily be grep'ed into other scripts.
|
|
||||||
|
|
||||||
|
|
||||||
* Test and support more file system types.
|
|
||||||
|
|
||||||
Actually this should be pretty simple now that the parameters are
|
|
||||||
stored in the configuration hash. The only issue is that trailing
|
|
||||||
whitespace is missing from the "make_fs_foo" option.
|
|
||||||
|
|
||||||
* xen-delete-image doesn't remove all logical volumes if --partitions is used.
|
|
||||||
|
|
||||||
See the link below for details how to reproduce. Reproducable at
|
|
||||||
least with --lvm. Thanks to Antoine Benkemoun for reporting.
|
|
||||||
|
|
||||||
http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
|
|
||||||
|
|
||||||
* xen-delete-image ignores extension setting
|
|
||||||
|
|
||||||
* xen-create-image should check all integer options on non-digits.
|
|
||||||
|
|
||||||
* Test suite should pass
|
|
||||||
|
|
||||||
Currently failing:
|
|
||||||
|
|
||||||
t/getopt.t
|
|
||||||
t/xen-delete-image.t
|
|
||||||
t/xen-tools.t
|
|
||||||
t/xt-create-xen-config.t
|
|
||||||
|
|
||||||
* Clean up setup-hostname - copying /etc/hosts isn't reliable
|
|
||||||
|
|
||||||
One could argue that that this gives "extra" information to the domU, since
|
|
||||||
the /etc/hosts file may contain more than just hosts on the same subnet.
|
|
||||||
This should atleast be disabled via a flag.
|
|
||||||
|
|
||||||
* Setup locales in the hooks?
|
|
||||||
|
|
||||||
Currently no locales are set and this causes several domU errors which appear
|
|
||||||
in the domU's logs.
|
|
||||||
|
|
||||||
Maybe for a 4.3 or 5.0 release
|
|
||||||
------------------------------
|
|
||||||
|
|
||||||
* xen-create-image --dist=... / sources.list generation should be more fine-grained
|
|
||||||
|
|
||||||
xen-tools should offer the possibility to enable/disable
|
|
||||||
security/volatile/backports as well as
|
|
||||||
contrib/non-free/universe/restricted/multiverse for each of them
|
|
||||||
not only based on defaults plus the Dom0's sources.list
|
|
||||||
|
|
||||||
One idea is to allow parameters like
|
|
||||||
|
|
||||||
--dist="lenny:main,contrib,non-free;security;volatile:main"
|
|
||||||
|
|
||||||
and maybe (if the default will be to include security) to also
|
|
||||||
allow
|
|
||||||
|
|
||||||
--dist="lenny;no-security"
|
|
||||||
|
|
||||||
The second idea (by Mathieu Parent) is to have an
|
|
||||||
/etc/xen-tools/sources.list.d/ which then contains files like
|
|
||||||
lenny.list, lenny-server.list, karmic.list, etc. which defaults to
|
|
||||||
$dist.list, but can be also select with --sources-list=lenny-server
|
|
||||||
(which looks for ./lenny-server.list, ./lenny-server,
|
|
||||||
/etc/xen-tools/sources.list.d/lenny-server.list and
|
|
||||||
/etc/xen-tools/sources.list.d/lenny-server in that order).
|
|
||||||
|
|
||||||
Third variant is to use /etc/xen-tools/sources.lists/ instead of
|
|
||||||
/etc/xen-tools/sources.list.d/ because that directory is no
|
|
||||||
runparts-like directory.
|
|
||||||
|
|
||||||
* LVM snapshot support as an install source.
|
|
||||||
|
|
||||||
* Clean up mounts on Ctrl-C, causes error while installing otherwise:
|
|
||||||
|
|
||||||
Removing /dev/vg0/acromantula-domu1-disk - since we're forcing the install
|
|
||||||
Can't remove open logical volume "acromantula-domu1-disk" this should be a
|
|
||||||
matter of unmounting the mounted volume from /tmp.
|
|
||||||
|
|
||||||
* Non-Interactive Password Handling
|
|
||||||
|
|
||||||
Option to generate passwords (check pwgen, apg, makepasswd, and
|
|
||||||
gpw which of them are best suited for generating complete
|
|
||||||
/etc/passwd and /etc/shadow lines). The password should be echo'ed
|
|
||||||
after installation in a way that can be easily grep'ed into other
|
|
||||||
scripts.
|
|
||||||
|
|
||||||
* Generic grub support
|
|
||||||
|
|
||||||
This will generate a much nicer menu.lst as a side effect, as its currently
|
|
||||||
generated once at install, and is never updated. Installing a full grub into
|
|
||||||
the domU should update the menu.lst every time a new kernel is installed and
|
|
||||||
will also use the domU distro's menu.lst conform.
|
|
||||||
|
|
||||||
* Move the hooks directory to /etc/xen-tools/ to officially allow
|
|
||||||
added and modified hooks.
|
|
||||||
|
|
||||||
* Clean up the hooks directory
|
|
||||||
|
|
||||||
Currently we have one directory for Ubuntu and Fedora named after
|
|
||||||
the first supported release which is then duplicated for each
|
|
||||||
subsequent release.
|
|
||||||
|
|
||||||
I'm sure this won't scale forever. So to minimise code duplication
|
|
||||||
I'd like to have one common directory per distribution (e.g. called
|
|
||||||
ubuntu-common, fedora-common, debian-common, maybe even deb-common,
|
|
||||||
rpm-common or yum-common for dpkg/apt-, rpm/yum-based
|
|
||||||
distributions, etc.) with generic hooks valid for all or most of
|
|
||||||
the releases of one distribution and then one hook directory per
|
|
||||||
release (e.g. called ubuntu-10.04 or ubuntu-lucid or so) which has
|
|
||||||
symbolic links to everything which can be used unchanged from the
|
|
||||||
common directory and new files for everything which has to be
|
|
||||||
different or only there.
|
|
||||||
|
|
||||||
* Create users, add ssh pubkeys to .ssh/authorized_keys
|
|
||||||
|
|
||||||
Still have to think of a good way of doing this. It would be nice
|
|
||||||
To specify a directory of public keys, parsing the hostnames
|
|
||||||
parsing the usernames from the ssh comment line
|
|
||||||
|
|
||||||
* More generic hooks
|
|
||||||
|
|
||||||
Deploy a web server or setup ssmtp directly via flag when setting up
|
|
||||||
the machine. Open to suggestions, should just be some general use-cases
|
|
||||||
that are fairly common.
|
|
||||||
|
|
||||||
* Sections for the xen-tools.conf file
|
|
||||||
|
|
||||||
Currently it's really annoying when you are trying to create VMs
|
|
||||||
on multiple subnets. It would be nice to specify with a flag what
|
|
||||||
"type" of configuration you want, and a set of options specific to
|
|
||||||
that flag could be parsed from xen-tools.conf
|
|
||||||
|
|
||||||
Stuff from Steve's TODO list / Generic TODOs
|
|
||||||
--------------------------------------------
|
|
||||||
|
|
||||||
* Write more test cases.
|
|
||||||
|
|
||||||
* xen-delete-image should unallocate any used IP addresses.
|
|
||||||
|
|||||||
1904
bin/xen-create-image
1904
bin/xen-create-image
File diff suppressed because it is too large
Load Diff
@@ -94,7 +94,7 @@ Show the version number and exit.
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -124,23 +124,23 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Default options
|
# Default options
|
||||||
#
|
#
|
||||||
$CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
|
$CONFIG{'template'} = '/etc/xen-tools/xm-nfs.tmpl';
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
# store version number away.
|
# store version number away.
|
||||||
$CONFIG{ 'xen_tools_version' } = $RELEASE;
|
$CONFIG{'xen_tools_version'} = $RELEASE;
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Read the global configuration file.
|
# Read the global configuration file.
|
||||||
#
|
#
|
||||||
readConfigurationFile("/etc/xen-tools/xen-tools.conf");
|
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -161,13 +161,13 @@ testArguments();
|
|||||||
if ( -e "/etc/xen/$CONFIG{'hostname'}.cfg" )
|
if ( -e "/etc/xen/$CONFIG{'hostname'}.cfg" )
|
||||||
{
|
{
|
||||||
die "Configuration file for $CONFIG{'hostname'} already exists"
|
die "Configuration file for $CONFIG{'hostname'} already exists"
|
||||||
unless ( $CONFIG{ 'force' } );
|
unless( $CONFIG{'force'} );
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we've been given any administrators then set them up.
|
# If we've been given any administrators then set them up.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'admins' } )
|
if ( $CONFIG{'admins'} )
|
||||||
{
|
{
|
||||||
setupAdminUsers();
|
setupAdminUsers();
|
||||||
}
|
}
|
||||||
@@ -197,20 +197,20 @@ exit;
|
|||||||
|
|
||||||
sub readConfigurationFile
|
sub readConfigurationFile
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ($file) = ( @_ );
|
||||||
|
|
||||||
# Don't read the file if it doesn't exist.
|
# Don't read the file if it doesn't exist.
|
||||||
return if ( !-e $file );
|
return if ( ! -e $file );
|
||||||
|
|
||||||
|
|
||||||
my $line = "";
|
my $line = "";
|
||||||
|
|
||||||
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
||||||
|
|
||||||
while ( defined( $line = <FILE> ) )
|
while (defined($line = <FILE>) )
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ( $line =~ s/\\$// )
|
if ($line =~ s/\\$//)
|
||||||
{
|
{
|
||||||
$line .= <FILE>;
|
$line .= <FILE>;
|
||||||
redo unless eof(FILE);
|
redo unless eof(FILE);
|
||||||
@@ -220,7 +220,7 @@ sub readConfigurationFile
|
|||||||
next if ( $line =~ /^([ \t]*)\#/ );
|
next if ( $line =~ /^([ \t]*)\#/ );
|
||||||
|
|
||||||
# Skip blank lines
|
# Skip blank lines
|
||||||
next if ( length($line) < 1 );
|
next if ( length( $line ) < 1 );
|
||||||
|
|
||||||
# Strip trailing comments.
|
# Strip trailing comments.
|
||||||
if ( $line =~ /(.*)\#(.*)/ )
|
if ( $line =~ /(.*)\#(.*)/ )
|
||||||
@@ -243,7 +243,6 @@ sub readConfigurationFile
|
|||||||
# command expansion?
|
# command expansion?
|
||||||
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
||||||
{
|
{
|
||||||
|
|
||||||
# store
|
# store
|
||||||
my $pre = $1;
|
my $pre = $1;
|
||||||
my $cmd = $2;
|
my $cmd = $2;
|
||||||
@@ -251,7 +250,7 @@ sub readConfigurationFile
|
|||||||
|
|
||||||
# get output
|
# get output
|
||||||
my $output = `$cmd`;
|
my $output = `$cmd`;
|
||||||
chomp($output);
|
chomp( $output );
|
||||||
|
|
||||||
# build up replacement.
|
# build up replacement.
|
||||||
$val = $pre . $output . $post;
|
$val = $pre . $output . $post;
|
||||||
@@ -262,7 +261,7 @@ sub readConfigurationFile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -287,48 +286,48 @@ sub parseCommandLineArguments
|
|||||||
#
|
#
|
||||||
GetOptions(
|
GetOptions(
|
||||||
|
|
||||||
# Networking options
|
# Networking options
|
||||||
"dhcp", \$CONFIG{ 'dhcp' },
|
"dhcp", \$CONFIG{'dhcp'},
|
||||||
"gateway=s", \$CONFIG{ 'gateway' },
|
"gateway=s", \$CONFIG{'gateway'},
|
||||||
"broadcast=s", \$CONFIG{ 'broadcast' },
|
"broadcast=s", \$CONFIG{'broadcast'},
|
||||||
"ip=s", \$CONFIG{ 'ip' },
|
"ip=s", \$CONFIG{'ip'},
|
||||||
"netmask=s", \$CONFIG{ 'netmask' },
|
"netmask=s", \$CONFIG{'netmask'},
|
||||||
"hostname=s", \$CONFIG{ 'hostname' },
|
"hostname=s", \$CONFIG{'hostname'},
|
||||||
"memory=s", \$CONFIG{ 'memory' },
|
"memory=s", \$CONFIG{'memory'},
|
||||||
"mac=s", \$CONFIG{ 'mac' },
|
"mac=s", \$CONFIG{'mac'},
|
||||||
|
|
||||||
# NFS options.
|
# NFS options.
|
||||||
"nfs_server=s", \$CONFIG{ 'nfs_server' },
|
"nfs_server=s", \$CONFIG{'nfs_server'},
|
||||||
"nfs_root=s", \$CONFIG{ 'nfs_root' },
|
"nfs_root=s", \$CONFIG{'nfs_root'},
|
||||||
|
|
||||||
# Misc. options
|
# Misc. options
|
||||||
"admins=s", \$CONFIG{ 'admins' },
|
"admins=s", \$CONFIG{'admins'},
|
||||||
"kernel=s", \$CONFIG{ 'kernel' },
|
"kernel=s", \$CONFIG{'kernel'},
|
||||||
"initrd=s", \$CONFIG{ 'initrd' },
|
"initrd=s", \$CONFIG{'initrd'},
|
||||||
"force", \$CONFIG{ 'force' },
|
"force", \$CONFIG{'force'},
|
||||||
"template=s", \$CONFIG{ 'template' },
|
"template=s", \$CONFIG{'template'},
|
||||||
|
|
||||||
# Help options
|
# Help options
|
||||||
"help", \$HELP,
|
"help", \$HELP,
|
||||||
"manual", \$MANUAL,
|
"manual", \$MANUAL,
|
||||||
"verbose", \$CONFIG{ 'verbose' },
|
"verbose", \$CONFIG{'verbose'},
|
||||||
"version", \$VERSION
|
"version", \$VERSION
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.13 $';
|
my $REVISION = '$Revision: 1.13 $';
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
$REVISION = $1;
|
$REVISION = $1;
|
||||||
}
|
}
|
||||||
|
|
||||||
logprint("xen-create-nfs release $RELEASE - CVS: $REVISION\n");
|
logprint( "xen-create-nfs release $RELEASE - CVS: $REVISION\n" );
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -345,37 +344,36 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub testArguments
|
sub testArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Hostname is mandatory
|
# Hostname is mandatory
|
||||||
#
|
#
|
||||||
die "No hostname" unless ( $CONFIG{ 'hostname' } );
|
die "No hostname" unless( $CONFIG{'hostname'} );
|
||||||
|
|
||||||
my @network = qw/ ip gateway netmask /;
|
my @network = qw/ ip gateway netmask /;
|
||||||
|
|
||||||
#
|
#
|
||||||
# If DHCP then all the other options aren't needed
|
# If DHCP then all the other options aren't needed
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'dhcp' } )
|
if ( $CONFIG{'dhcp'} )
|
||||||
{
|
{
|
||||||
foreach my $f (@network)
|
foreach my $f ( @network )
|
||||||
{
|
{
|
||||||
delete( $CONFIG{ $f } );
|
delete( $CONFIG{ $f } );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
foreach my $f (@network)
|
foreach my $f ( @network )
|
||||||
{
|
{
|
||||||
die "Missing --$f" unless ( $CONFIG{ $f } );
|
die "Missing --$f" unless( $CONFIG{$f} );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# We need an NFS server + root
|
# We need an NFS server + root
|
||||||
#
|
#
|
||||||
die "Missing NFS server." unless ( $CONFIG{ 'nfs_server' } );
|
die "Missing NFS server." unless( $CONFIG{'nfs_server'} );
|
||||||
die "Missing NFS root." unless ( $CONFIG{ 'nfs_root' } );
|
die "Missing NFS root." unless( $CONFIG{'nfs_root'} );
|
||||||
|
|
||||||
|
|
||||||
# All OK.
|
# All OK.
|
||||||
@@ -383,6 +381,7 @@ sub testArguments
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
This routine is designed to ensure that any users specified with
|
This routine is designed to ensure that any users specified with
|
||||||
@@ -394,7 +393,6 @@ sub testArguments
|
|||||||
|
|
||||||
sub setupAdminUsers
|
sub setupAdminUsers
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we're not root we can't modify users.
|
# If we're not root we can't modify users.
|
||||||
#
|
#
|
||||||
@@ -403,26 +401,24 @@ sub setupAdminUsers
|
|||||||
#
|
#
|
||||||
# If we don't have a sudoers file then we'll also ignore this.
|
# If we don't have a sudoers file then we'll also ignore this.
|
||||||
#
|
#
|
||||||
return if ( !-e "/etc/sudoers" );
|
return if ( ! -e "/etc/sudoers" );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Find the path to the xen-login-shell
|
# Find the path to the xen-login-shell
|
||||||
#
|
#
|
||||||
my $shell = undef;
|
my $shell = undef;
|
||||||
$shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
|
$shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
|
||||||
$shell = "/usr/local/bin/xen-login-shell"
|
$shell = "/usr/local/bin/xen-login-shell" if ( -x "/usr/bin/local/xen-login-shell" );
|
||||||
if ( -x "/usr/bin/local/xen-login-shell" );
|
|
||||||
|
|
||||||
return if ( !defined($shell) );
|
return if ( !defined( $shell ) );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# For each user make sure they exist, and setup the
|
# For each user make sure they exist, and setup the
|
||||||
# login shell for them.
|
# login shell for them.
|
||||||
#
|
#
|
||||||
foreach my $user ( split( /,/, $ENV{ 'admins' } ) )
|
foreach my $user ( split( /,/, $ENV{'admins'} ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
# Strip leading and trailing whitespace.
|
# Strip leading and trailing whitespace.
|
||||||
$user =~ s/^\s+//;
|
$user =~ s/^\s+//;
|
||||||
$user =~ s/\s+$//;
|
$user =~ s/\s+$//;
|
||||||
@@ -433,27 +429,23 @@ sub setupAdminUsers
|
|||||||
# Does the user exist?
|
# Does the user exist?
|
||||||
if ( getpwnam($user) )
|
if ( getpwnam($user) )
|
||||||
{
|
{
|
||||||
|
|
||||||
# Change shell.
|
# Change shell.
|
||||||
$CONFIG{ 'verbose' } && print "Changing shell for $user: $shell\n";
|
$CONFIG{'verbose'} && print "Changing shell for $user: $shell\n";
|
||||||
system( "chsh", "-s", $shell, $user );
|
system( "chsh", "-s", $shell, $user );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
# Add a new user.
|
# Add a new user.
|
||||||
$CONFIG{ 'verbose' } && print "Adding new user: $user\n";
|
$CONFIG{'verbose'} && print "Adding new user: $user\n";
|
||||||
system( "useradd", "-s", $shell, $user );
|
system( "useradd", "-s", $shell, $user );
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Add the entry to /etc/sudoers.
|
# Add the entry to /etc/sudoers.
|
||||||
#
|
#
|
||||||
open( SUDOERS, ">>", "/etc/sudoers" ) or
|
open( SUDOERS, ">>", "/etc/sudoers" ) or warn "Failed to add user to sudoers file : $user - $!";
|
||||||
warn "Failed to add user to sudoers file : $user - $!";
|
print SUDOERS "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
|
||||||
print SUDOERS
|
close( SUDOERS );
|
||||||
"$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
|
|
||||||
close(SUDOERS);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -469,16 +461,15 @@ sub setupAdminUsers
|
|||||||
|
|
||||||
sub createNewConfigurationFile
|
sub createNewConfigurationFile
|
||||||
{
|
{
|
||||||
die "Template file missing: $CONFIG{'template'}"
|
die "Template file missing: $CONFIG{'template'}" unless( -e $CONFIG{'template'} );
|
||||||
unless ( -e $CONFIG{ 'template' } );
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Load the template.
|
# Load the template.
|
||||||
#
|
#
|
||||||
my $template = new Text::Template( TYPE => 'FILE',
|
my $template = new Text::Template( TYPE => 'FILE',
|
||||||
SOURCE => $CONFIG{ 'template' } );
|
SOURCE => $CONFIG{'template'} );
|
||||||
|
|
||||||
my $result = $template->fill_in( HASH => \%CONFIG );
|
my $result = $template->fill_in( HASH => \%CONFIG );
|
||||||
|
|
||||||
#
|
#
|
||||||
# The file we'll write to.
|
# The file we'll write to.
|
||||||
@@ -490,5 +481,5 @@ sub createNewConfigurationFile
|
|||||||
#
|
#
|
||||||
open( FILE, ">", $file ) or die "Failed to write to $file - $!";
|
open( FILE, ">", $file ) or die "Failed to write to $file - $!";
|
||||||
print FILE $result;
|
print FILE $result;
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,12 +15,9 @@ xen-delete-image - Delete previously created Xen instances.
|
|||||||
--verbose Show diagnostic output.
|
--verbose Show diagnostic output.
|
||||||
|
|
||||||
General options:
|
General options:
|
||||||
--dir Specify the output directory where images were previously
|
--dir Specify the output directory where images were previously saved.
|
||||||
saved. (old style)
|
--lvm Specify the LVM volume to use.
|
||||||
--domaindir Specify the output directory where images were previously
|
--evms Specify the EVMS container to use.
|
||||||
saved. (new style)
|
|
||||||
--lvm Specify the LVM volume to use.
|
|
||||||
--evms Specify the EVMS container to use.
|
|
||||||
|
|
||||||
Specifying hosts:
|
Specifying hosts:
|
||||||
--hostname Specify the image name to delete.
|
--hostname Specify the image name to delete.
|
||||||
@@ -36,14 +33,7 @@ xen-delete-image - Delete previously created Xen instances.
|
|||||||
=over 8
|
=over 8
|
||||||
|
|
||||||
=item B<--dir>
|
=item B<--dir>
|
||||||
Specify the output directory where images were previously saved. Looks
|
Specify the output directory where images were previously saved.
|
||||||
for directories named after the hostname in a subdirectory
|
|
||||||
"domains". (old style, see xen-create-image(1) for details)
|
|
||||||
|
|
||||||
=item B<--domaindir>
|
|
||||||
Specify the output directory where images were previously saved. Looks
|
|
||||||
for directories named after the hostname directorly in this
|
|
||||||
directory. (new style, see xen-create-image(1) for details)
|
|
||||||
|
|
||||||
=item B<--evms>
|
=item B<--evms>
|
||||||
Specify the EVMS container where images were previously saved.
|
Specify the EVMS container where images were previously saved.
|
||||||
@@ -151,7 +141,7 @@ Show the version number and exit.
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -179,7 +169,8 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -188,7 +179,7 @@ my $RELEASE = '4.2rc1';
|
|||||||
#
|
#
|
||||||
if ( -e "/etc/xen-tools/xen-tools.conf" )
|
if ( -e "/etc/xen-tools/xen-tools.conf" )
|
||||||
{
|
{
|
||||||
readConfigurationFile("/etc/xen-tools/xen-tools.conf");
|
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -208,7 +199,7 @@ checkArguments();
|
|||||||
#
|
#
|
||||||
# Abort if non-root user.
|
# Abort if non-root user.
|
||||||
#
|
#
|
||||||
if ( ( !$CONFIG{ 'test' } ) && ( $EFFECTIVE_USER_ID != 0 ) )
|
if ( (!$CONFIG{'test'}) && ( $EFFECTIVE_USER_ID != 0 ) )
|
||||||
{
|
{
|
||||||
print <<E_O_ROOT;
|
print <<E_O_ROOT;
|
||||||
|
|
||||||
@@ -226,11 +217,11 @@ E_O_ROOT
|
|||||||
# Loop over the supplied arguments, and attempt to delete each
|
# Loop over the supplied arguments, and attempt to delete each
|
||||||
# image.
|
# image.
|
||||||
#
|
#
|
||||||
while ( my $name = shift )
|
while( my $name = shift )
|
||||||
{
|
{
|
||||||
if ( !xenRunning($name) )
|
if ( !xenRunning( $name ) )
|
||||||
{
|
{
|
||||||
deleteXenImage($name);
|
deleteXenImage( $name );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -241,12 +232,12 @@ while ( my $name = shift )
|
|||||||
#
|
#
|
||||||
# Also delete any which were specified using the --hostname flag
|
# Also delete any which were specified using the --hostname flag
|
||||||
#
|
#
|
||||||
my $hosts = $CONFIG{ 'hostname' };
|
my $hosts = $CONFIG{'hostname'};
|
||||||
foreach my $name (@$hosts)
|
foreach my $name ( @$hosts )
|
||||||
{
|
{
|
||||||
if ( !xenRunning($name) )
|
if ( !xenRunning( $name ) )
|
||||||
{
|
{
|
||||||
deleteXenImage($name);
|
deleteXenImage( $name );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -261,6 +252,7 @@ exit 0;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Read the configuration file specified.
|
Read the configuration file specified.
|
||||||
@@ -271,16 +263,16 @@ exit 0;
|
|||||||
|
|
||||||
sub readConfigurationFile
|
sub readConfigurationFile
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ($file) = ( @_ );
|
||||||
|
|
||||||
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
||||||
|
|
||||||
my $line = "";
|
my $line = "";
|
||||||
|
|
||||||
while ( defined( $line = <FILE> ) )
|
while (defined($line = <FILE>) )
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ( $line =~ s/\\$// )
|
if ($line =~ s/\\$//)
|
||||||
{
|
{
|
||||||
$line .= <FILE>;
|
$line .= <FILE>;
|
||||||
redo unless eof(FILE);
|
redo unless eof(FILE);
|
||||||
@@ -290,7 +282,7 @@ sub readConfigurationFile
|
|||||||
next if ( $line =~ /^([ \t]*)\#/ );
|
next if ( $line =~ /^([ \t]*)\#/ );
|
||||||
|
|
||||||
# Skip blank lines
|
# Skip blank lines
|
||||||
next if ( length($line) < 1 );
|
next if ( length( $line ) < 1 );
|
||||||
|
|
||||||
# Strip trailing comments.
|
# Strip trailing comments.
|
||||||
if ( $line =~ /(.*)\#(.*)/ )
|
if ( $line =~ /(.*)\#(.*)/ )
|
||||||
@@ -313,7 +305,6 @@ sub readConfigurationFile
|
|||||||
# command expansion?
|
# command expansion?
|
||||||
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
||||||
{
|
{
|
||||||
|
|
||||||
# store
|
# store
|
||||||
my $pre = $1;
|
my $pre = $1;
|
||||||
my $cmd = $2;
|
my $cmd = $2;
|
||||||
@@ -321,7 +312,7 @@ sub readConfigurationFile
|
|||||||
|
|
||||||
# get output
|
# get output
|
||||||
my $output = `$cmd`;
|
my $output = `$cmd`;
|
||||||
chomp($output);
|
chomp( $output );
|
||||||
|
|
||||||
# build up replacement.
|
# build up replacement.
|
||||||
$val = $pre . $output . $post;
|
$val = $pre . $output . $post;
|
||||||
@@ -332,11 +323,12 @@ sub readConfigurationFile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Parse the arguments specified upon the command line.
|
Parse the arguments specified upon the command line.
|
||||||
@@ -350,44 +342,38 @@ sub parseCommandLineArguments
|
|||||||
my $HELP = 0;
|
my $HELP = 0;
|
||||||
my $MANUAL = 0;
|
my $MANUAL = 0;
|
||||||
my $VERSION = 0;
|
my $VERSION = 0;
|
||||||
$CONFIG{ 'dry-run' } = 0;
|
|
||||||
|
|
||||||
# Parse options.
|
# Parse options.
|
||||||
#
|
#
|
||||||
GetOptions( "dir=s", \$CONFIG{ 'dir' },
|
GetOptions(
|
||||||
"domaindir=s", \$CONFIG{ 'domaindir' },
|
"dir=s", \$CONFIG{'dir'},
|
||||||
"dry-run", \$CONFIG{ 'dry-run' },
|
"lvm=s", \$CONFIG{'lvm'},
|
||||||
"lvm=s", \$CONFIG{ 'lvm' },
|
"evms=s", \$CONFIG{'evms'},
|
||||||
"evms=s", \$CONFIG{ 'evms' },
|
"hostname=s@", \$CONFIG{'hostname'},
|
||||||
"hostname=s@", \$CONFIG{ 'hostname' },
|
"test", \$CONFIG{'test'},
|
||||||
"test", \$CONFIG{ 'test' },
|
"verbose", \$CONFIG{'verbose'},
|
||||||
"verbose", \$CONFIG{ 'verbose' },
|
"help", \$HELP,
|
||||||
"help", \$HELP,
|
"manual", \$MANUAL,
|
||||||
"manual", \$MANUAL,
|
"version", \$VERSION
|
||||||
"version", \$VERSION
|
);
|
||||||
);
|
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
if ($VERSION)
|
|
||||||
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.41 $';
|
my $REVISION = '$Revision: 1.41 $';
|
||||||
|
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
$REVISION = $1;
|
$REVISION = $1;
|
||||||
}
|
}
|
||||||
|
|
||||||
print "xen-delete-image release $RELEASE - CVS: $REVISION\n";
|
print "xen-delete-image release $RELEASE - CVS: $REVISION\n";
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($CONFIG{ 'dir' }) {
|
|
||||||
$CONFIG{ 'domaindir' } = $CONFIG{ 'dir' }.'/domains';
|
|
||||||
$CONFIG{ 'dir' } = undef;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -402,23 +388,22 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub checkArguments
|
sub checkArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# When testing we only care about loopback images, not disk images.
|
# When testing we only care about loopback images, not disk images.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'test' } )
|
if ( $CONFIG{'test'} )
|
||||||
{
|
{
|
||||||
$CONFIG{ 'lvm' } = undef;
|
$CONFIG{'lvm'} = undef;
|
||||||
$CONFIG{ 'evms' } = undef;
|
$CONFIG{'evms'} = undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Make sure we got one and only one installation method.
|
# Make sure we got one and only one installation method.
|
||||||
#
|
#
|
||||||
my $count = 0;
|
my $count = 0;
|
||||||
foreach my $type (qw/dir domaindir lvm evms/)
|
foreach my $type ( qw/dir lvm evms/ )
|
||||||
{
|
{
|
||||||
$count += 1 if defined( $CONFIG{ $type } );
|
$count += 1 if defined( $CONFIG{$type} );
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -427,17 +412,17 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
if ( $count != 1 )
|
if ( $count != 1 )
|
||||||
{
|
{
|
||||||
print "Please select one and only one of the installation methods:\n";
|
print "Please select one and only one of the installation methods:\n";
|
||||||
print " --dir\n";
|
print " --dir\n";
|
||||||
print " --domaindir\n";
|
print " --evms\n";
|
||||||
print " --evms\n";
|
print " --lvm\n";
|
||||||
print " --lvm\n";
|
exit;
|
||||||
exit;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Test to see if the given instance is running.
|
Test to see if the given instance is running.
|
||||||
@@ -448,20 +433,20 @@ sub checkArguments
|
|||||||
|
|
||||||
sub xenRunning
|
sub xenRunning
|
||||||
{
|
{
|
||||||
my ($hostname) = (@_);
|
my( $hostname ) = (@_ );
|
||||||
|
|
||||||
my $running = 0;
|
my $running = 0;
|
||||||
|
|
||||||
open( CMD, "xm list $hostname 2>/dev/null |" ) or
|
open( CMD, "xm list $hostname 2>/dev/null |")
|
||||||
die "Failed to run 'xm list $hostname'";
|
or die "Failed to run 'xm list $hostname'";
|
||||||
while (<CMD>)
|
while( <CMD> )
|
||||||
{
|
{
|
||||||
my $line = $_;
|
my $line = $_;
|
||||||
$running = 1 if ( $line =~ /\Q$hostname\E/ );
|
$running = 1 if ( $line =~ /\Q$hostname\E/ )
|
||||||
}
|
}
|
||||||
close(CMD);
|
close( CMD );
|
||||||
|
|
||||||
return ($running);
|
return( $running );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -476,7 +461,7 @@ sub xenRunning
|
|||||||
|
|
||||||
sub deleteXenImage
|
sub deleteXenImage
|
||||||
{
|
{
|
||||||
my ($hostname) = (@_);
|
my ($hostname) = ( @_ );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Collect the names of files to delete.
|
# Collect the names of files to delete.
|
||||||
@@ -502,16 +487,12 @@ sub deleteXenImage
|
|||||||
#
|
#
|
||||||
# If we're working on disk images remove them.
|
# If we're working on disk images remove them.
|
||||||
#
|
#
|
||||||
foreach my $file (@delete)
|
foreach my $file ( @delete )
|
||||||
{
|
{
|
||||||
if ( -e $file )
|
if ( -e $file )
|
||||||
{
|
{
|
||||||
if ($CONFIG{ 'dry-run' }) {
|
print "Deleting: $file\n";
|
||||||
print "Would delete: $file\n";
|
unlink( $file );
|
||||||
} else {
|
|
||||||
print "Deleting: $file\n";
|
|
||||||
unlink($file);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -520,95 +501,71 @@ sub deleteXenImage
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ( defined( $CONFIG{ 'domaindir' } ) )
|
if ( defined( $CONFIG{'dir'} ) )
|
||||||
{
|
{
|
||||||
my $prefix = $CONFIG{ 'domaindir' } . '/';
|
my $prefix = $CONFIG{'dir'} . "/domains/";
|
||||||
|
|
||||||
#
|
#
|
||||||
# Now remove the directory.
|
# Now remove the directory.
|
||||||
#
|
#
|
||||||
if ( -d $prefix . $hostname )
|
if ( -d $prefix . $hostname )
|
||||||
{
|
{
|
||||||
if ($CONFIG{ 'dry-run' }) {
|
print "Removing: " . $prefix . $hostname . "\n";
|
||||||
print "Would delete: $prefix$hostname\n";
|
rmdir ( $prefix . $hostname );
|
||||||
} else {
|
}
|
||||||
print "Removing: " . $prefix . $hostname . "\n";
|
|
||||||
rmdir( $prefix . $hostname );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
elsif ( defined( $CONFIG{ 'lvm' } ) )
|
elsif ( defined( $CONFIG{'lvm'} ) )
|
||||||
{
|
{
|
||||||
|
#
|
||||||
|
# LVM volumes
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# TODO: Check we're not mounted.
|
||||||
|
#
|
||||||
|
|
||||||
#
|
if ( -e "/dev/$CONFIG{'lvm'}/$hostname-swap" )
|
||||||
# LVM volumes
|
{
|
||||||
#
|
print "Removing swap volume\n";
|
||||||
#
|
runCommand( "lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force" );
|
||||||
# TODO: Check we're not mounted.
|
}
|
||||||
#
|
|
||||||
|
|
||||||
if ( -e "/dev/$CONFIG{'lvm'}/$hostname-swap" )
|
if ( -e "/dev/$CONFIG{'lvm'}/$hostname-disk" )
|
||||||
{
|
{
|
||||||
if ($CONFIG{ 'dry-run' }) {
|
print "Removing LVM disk volume\n";
|
||||||
print "Would remove LVM swap volume /dev/$CONFIG{'lvm'}/$hostname-swap\n";
|
runCommand( "lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force" );
|
||||||
} else {
|
}
|
||||||
print "Removing swap volume\n";
|
|
||||||
runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-swap --force");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( -e "/dev/$CONFIG{'lvm'}/$hostname-disk" )
|
|
||||||
{
|
|
||||||
if ($CONFIG{ 'dry-run' }) {
|
|
||||||
print "Would remove LVM disk volume /dev/$CONFIG{'lvm'}/$hostname-disk\n";
|
|
||||||
} else {
|
|
||||||
print "Removing LVM disk volume\n";
|
|
||||||
runCommand("lvremove /dev/$CONFIG{'lvm'}/$hostname-disk --force");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
elsif ( defined( $CONFIG{ 'evms' } ) )
|
elsif ( defined( $CONFIG{'evms'} ) )
|
||||||
{
|
{
|
||||||
|
#
|
||||||
|
# EVMS volumes
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# TODO: Check we're not mounted.
|
||||||
|
#
|
||||||
|
|
||||||
#
|
if ( -e "/dev/evms/$hostname-swap" )
|
||||||
# EVMS volumes
|
{
|
||||||
#
|
print "Removing EVMS swap volume\n";
|
||||||
#
|
runCommand( "echo Delete : /dev/evms/$hostname-swap | evms" );
|
||||||
# TODO: Check we're not mounted.
|
runCommand( "echo Delete : $CONFIG{'evms'}/$hostname-swap | evms" );
|
||||||
#
|
}
|
||||||
|
|
||||||
if ( -e "/dev/evms/$hostname-swap" )
|
if ( -e "/dev/evms/$hostname-disk" )
|
||||||
{
|
{
|
||||||
if ($CONFIG{ 'dry-run' }) {
|
print "Removing EVMS disk volume\n";
|
||||||
print "Would remove EVMS swap volume: /dev/evms/$hostname-swap\n";
|
runCommand( "echo Delete : /dev/evms/$hostname-disk | evms" );
|
||||||
print "Would remove EVMS swap volume: $CONFIG{'evms'}/$hostname-swap\n";
|
runCommand( "echo Delete : $CONFIG{'evms'}/$hostname-disk | evms" );
|
||||||
} else {
|
}
|
||||||
print "Removing EVMS swap volume\n";
|
|
||||||
runCommand("echo Delete : /dev/evms/$hostname-swap | evms");
|
|
||||||
runCommand("echo Delete : $CONFIG{'evms'}/$hostname-swap | evms");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( -e "/dev/evms/$hostname-disk" )
|
|
||||||
{
|
|
||||||
if ($CONFIG{ 'dry-run' }) {
|
|
||||||
print "Would remove EVMS disk volume: /dev/evms/$hostname-swap\n";
|
|
||||||
print "Would remove EVMS disk volume: $CONFIG{'evms'}/$hostname-swap\n";
|
|
||||||
} else {
|
|
||||||
print "Removing EVMS disk volume\n";
|
|
||||||
runCommand("echo Delete : /dev/evms/$hostname-disk | evms");
|
|
||||||
runCommand("echo Delete : $CONFIG{'evms'}/$hostname-disk | evms");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Error: No installation type specified\n";
|
print "Error: No installation type specified\n";
|
||||||
print "Can't happen!\n";
|
print "Can't happen!\n";
|
||||||
print "Hostname : $hostname\n";
|
print "Hostname : $hostname\n";
|
||||||
exit 127;
|
exit 127;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -627,27 +584,26 @@ sub deleteXenImage
|
|||||||
|
|
||||||
sub runCommand
|
sub runCommand
|
||||||
{
|
{
|
||||||
my ($cmd) = (@_);
|
my ( $cmd ) = (@_ );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Header.
|
# Header.
|
||||||
#
|
#
|
||||||
$CONFIG{ 'verbose' } && print "Executing : $cmd\n";
|
$CONFIG{'verbose'} && print "Executing : $cmd\n";
|
||||||
|
|
||||||
#
|
#
|
||||||
# Hide output unless running with --debug.
|
# Hide output unless running with --debug.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'verbose' } )
|
if ( $CONFIG{'verbose'} )
|
||||||
{
|
{
|
||||||
|
#
|
||||||
#
|
# Copy stderr to stdout, so we can see it.
|
||||||
# Copy stderr to stdout, so we can see it.
|
#
|
||||||
#
|
$cmd .= " 2>&1";
|
||||||
$cmd .= " 2>&1";
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$cmd .= " >/dev/null 2>/dev/null";
|
$cmd .= " >/dev/null 2>/dev/null" ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -658,19 +614,19 @@ sub runCommand
|
|||||||
|
|
||||||
if ( $? != 0 )
|
if ( $? != 0 )
|
||||||
{
|
{
|
||||||
print "Running command '$cmd' failed.\n";
|
print "Running command '$cmd' failed.\n";
|
||||||
print "Aborting\n";
|
print "Aborting\n";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# All done.
|
# All done.
|
||||||
#
|
#
|
||||||
$CONFIG{ 'verbose' } && print "Output\n";
|
$CONFIG{'verbose'} && print "Output\n";
|
||||||
$CONFIG{ 'verbose' } && print "======\n";
|
$CONFIG{'verbose'} && print "======\n";
|
||||||
$CONFIG{ 'verbose' } && print $output . "\n";
|
$CONFIG{'verbose'} && print $output . "\n";
|
||||||
$CONFIG{ 'verbose' } && print "Finished : $cmd\n";
|
$CONFIG{'verbose'} && print "Finished : $cmd\n";
|
||||||
|
|
||||||
return ($output);
|
return( $output );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ Show the version number and exit.
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -97,19 +97,19 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Default prefix
|
# Default prefix
|
||||||
#
|
#
|
||||||
$CONFIG{ 'prefix' } = "/etc/xen";
|
$CONFIG{'prefix'} = "/etc/xen";
|
||||||
|
|
||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Read the global configuration file if it exists.
|
# Read the global configuration file if it exists.
|
||||||
#
|
#
|
||||||
readConfigurationFile("/etc/xen-tools/xen-tools.conf");
|
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -129,11 +129,11 @@ my @instances = findXenInstances();
|
|||||||
# Now process each instance.
|
# Now process each instance.
|
||||||
#
|
#
|
||||||
my $count = 0;
|
my $count = 0;
|
||||||
foreach my $instance (@instances)
|
foreach my $instance ( @instances )
|
||||||
{
|
{
|
||||||
if ($count) {print "\n";}
|
if ( $count ) { print "\n"; }
|
||||||
|
|
||||||
displayInstance($instance);
|
displayInstance( $instance );
|
||||||
$count += 1;
|
$count += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,18 +155,18 @@ exit;
|
|||||||
|
|
||||||
sub readConfigurationFile
|
sub readConfigurationFile
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ($file) = ( @_ );
|
||||||
|
|
||||||
# Don't read the file if it doesn't exist.
|
# Don't read the file if it doesn't exist.
|
||||||
return if ( !-e $file );
|
return if ( ! -e $file );
|
||||||
|
|
||||||
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
||||||
|
|
||||||
|
|
||||||
while ( defined( my $line = <FILE> ) )
|
while (defined(my $line = <FILE>) )
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ( $line =~ s/\\$// )
|
if ($line =~ s/\\$//)
|
||||||
{
|
{
|
||||||
$line .= <FILE>;
|
$line .= <FILE>;
|
||||||
redo unless eof(FILE);
|
redo unless eof(FILE);
|
||||||
@@ -176,7 +176,7 @@ sub readConfigurationFile
|
|||||||
next if ( $line =~ /^([ \t]*)\#/ );
|
next if ( $line =~ /^([ \t]*)\#/ );
|
||||||
|
|
||||||
# Skip blank lines
|
# Skip blank lines
|
||||||
next if ( length($line) < 1 );
|
next if ( length( $line ) < 1 );
|
||||||
|
|
||||||
# Strip trailing comments.
|
# Strip trailing comments.
|
||||||
if ( $line =~ /(.*)\#(.*)/ )
|
if ( $line =~ /(.*)\#(.*)/ )
|
||||||
@@ -199,7 +199,6 @@ sub readConfigurationFile
|
|||||||
# command expansion?
|
# command expansion?
|
||||||
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
||||||
{
|
{
|
||||||
|
|
||||||
# store
|
# store
|
||||||
my $pre = $1;
|
my $pre = $1;
|
||||||
my $cmd = $2;
|
my $cmd = $2;
|
||||||
@@ -207,7 +206,7 @@ sub readConfigurationFile
|
|||||||
|
|
||||||
# get output
|
# get output
|
||||||
my $output = `$cmd`;
|
my $output = `$cmd`;
|
||||||
chomp($output);
|
chomp( $output );
|
||||||
|
|
||||||
# build up replacement.
|
# build up replacement.
|
||||||
$val = $pre . $output . $post;
|
$val = $pre . $output . $post;
|
||||||
@@ -217,11 +216,12 @@ sub readConfigurationFile
|
|||||||
$CONFIG{ $key } = $val;
|
$CONFIG{ $key } = $val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Parse the arguments specified upon the command line.
|
Parse the arguments specified upon the command line.
|
||||||
@@ -234,20 +234,24 @@ sub parseCommandLineArguments
|
|||||||
{
|
{
|
||||||
my $HELP = 0;
|
my $HELP = 0;
|
||||||
my $MANUAL = 0;
|
my $MANUAL = 0;
|
||||||
my $VERSION = 0;
|
my $VERSION = 0;
|
||||||
|
|
||||||
# Parse options.
|
# Parse options.
|
||||||
#
|
#
|
||||||
GetOptions( "test=s", \$CONFIG{ 'prefix' },
|
GetOptions(
|
||||||
"help", \$HELP, "manual", \$MANUAL, "version", \$VERSION );
|
"test=s", \$CONFIG{'prefix'},
|
||||||
|
"help", \$HELP,
|
||||||
|
"manual", \$MANUAL,
|
||||||
|
"version", \$VERSION
|
||||||
|
);
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.30 $';
|
my $REVISION = '$Revision: 1.30 $';
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
$REVISION = $1;
|
$REVISION = $1;
|
||||||
@@ -273,12 +277,12 @@ sub findXenInstances
|
|||||||
{
|
{
|
||||||
my @found;
|
my @found;
|
||||||
|
|
||||||
foreach my $file ( sort( glob( $CONFIG{ 'prefix' } . "/*.cfg" ) ) )
|
foreach my $file ( sort( glob( $CONFIG{'prefix'} . "/*.cfg" ) ) )
|
||||||
{
|
{
|
||||||
push @found, $file if ( -e $file );
|
push @found, $file if ( -e $file );
|
||||||
}
|
}
|
||||||
|
|
||||||
return (@found);
|
return( @found );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -294,14 +298,14 @@ sub findXenInstances
|
|||||||
|
|
||||||
sub displayInstance
|
sub displayInstance
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ( $file ) = ( @_ );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Read each line.
|
# Read each line.
|
||||||
#
|
#
|
||||||
open( FILY, "<", $file );
|
open( FILY, "<", $file );
|
||||||
my @LINES = <FILY>;
|
my @LINES = <FILY>;
|
||||||
close(FILY);
|
close( FILY );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Is it dynamic?
|
# Is it dynamic?
|
||||||
@@ -312,7 +316,7 @@ sub displayInstance
|
|||||||
my $name = '';
|
my $name = '';
|
||||||
my $mem = 0;
|
my $mem = 0;
|
||||||
|
|
||||||
foreach my $line (@LINES)
|
foreach my $line ( @LINES )
|
||||||
{
|
{
|
||||||
if ( $line =~ /^\s*dhcp\s*=\s*"dhcp\"/i )
|
if ( $line =~ /^\s*dhcp\s*=\s*"dhcp\"/i )
|
||||||
{
|
{
|
||||||
@@ -338,7 +342,7 @@ sub displayInstance
|
|||||||
|
|
||||||
print "Name: $name\n";
|
print "Name: $name\n";
|
||||||
print "Memory: $mem\n";
|
print "Memory: $mem\n";
|
||||||
print "IP: " . $ip . $mac . "\n" if length($ip);
|
print "IP: " . $ip . $mac . "\n" if length( $ip );
|
||||||
print "DHCP" . $mac . "\n" if $dhcp;
|
print "DHCP" . $mac . "\n" if $dhcp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,10 @@ xen-resize-guest - Resize a loopback or LVM based xen guest.
|
|||||||
--verbose Show diagnostic output.
|
--verbose Show diagnostic output.
|
||||||
|
|
||||||
General Options:
|
General Options:
|
||||||
--add Specify the amount of space to add, e.g. --add=1gb
|
--add Specify the amount of space to add, e.g. --add=1gb
|
||||||
--dir Specify the path to the loopback image root. (old style)
|
--dir Specify the path to the loopback image root.
|
||||||
--domaindir Specify the path to the loopback image root. (new style)
|
--force Force the resize to happen without a last-chance delay.
|
||||||
--force Force the resize to happen without a last-chance delay.
|
--hostname Specify the hostname of the guest to resize.
|
||||||
--hostname Specify the hostname of the guest to resize.
|
|
||||||
|
|
||||||
=cut
|
=cut
|
||||||
|
|
||||||
@@ -29,14 +28,10 @@ xen-resize-guest - Resize a loopback or LVM based xen guest.
|
|||||||
=over 8
|
=over 8
|
||||||
|
|
||||||
=item B<--add>
|
=item B<--add>
|
||||||
Specify the amount of storage to add to the primary disk. Looks
|
Specify the amount of storage to add to the primary disk.
|
||||||
for directories named after the hostname in a subdirectory
|
|
||||||
"domains". (old style, see xen-create-image(1) for details)
|
|
||||||
|
|
||||||
=item B<--domaindir>
|
=item B<--dir>
|
||||||
Specify the directory where the loopback files are based. Looks
|
Specify the directory where the loopback files are based.
|
||||||
for directories named after the hostname directorly in this
|
|
||||||
directory. (new style, see xen-create-image(1) for details)
|
|
||||||
|
|
||||||
=item B<--force>
|
=item B<--force>
|
||||||
Don't pause for 10 seconds prior to commencing.
|
Don't pause for 10 seconds prior to commencing.
|
||||||
@@ -92,7 +87,7 @@ Show the version number and exit.
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -112,6 +107,8 @@ use Text::Template;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Configuration values read from the command line, or configuration file.
|
# Configuration values read from the command line, or configuration file.
|
||||||
#
|
#
|
||||||
@@ -121,14 +118,14 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Read the global configuration file.
|
# Read the global configuration file.
|
||||||
#
|
#
|
||||||
readConfigurationFile("/etc/xen-tools/xen-tools.conf");
|
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -148,15 +145,13 @@ testArguments();
|
|||||||
#
|
#
|
||||||
my $path = undef;
|
my $path = undef;
|
||||||
|
|
||||||
if ( $CONFIG{ 'domaindir' } )
|
if ( $CONFIG{'dir'} )
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Make sure we can find the disk
|
# Make sure we can find the disk
|
||||||
#
|
#
|
||||||
$path =
|
$path = $CONFIG{'dir'} . "/domains/" . $CONFIG{'hostname'} . "/disk.img";
|
||||||
$CONFIG{ 'domaindir' } . '/' . $CONFIG{ 'hostname' } . "/disk.img";
|
if ( ! -e $path )
|
||||||
if ( !-e $path )
|
|
||||||
{
|
{
|
||||||
print <<EOF;
|
print <<EOF;
|
||||||
|
|
||||||
@@ -193,7 +188,7 @@ EOF
|
|||||||
#
|
#
|
||||||
# Allow panic
|
# Allow panic
|
||||||
#
|
#
|
||||||
if ( !$CONFIG{ 'force' } )
|
if ( !$CONFIG{'force'} )
|
||||||
{
|
{
|
||||||
foreach my $i ( 1 .. 10 )
|
foreach my $i ( 1 .. 10 )
|
||||||
{
|
{
|
||||||
@@ -206,16 +201,15 @@ EOF
|
|||||||
print "DO NOT INTERRUPT\n";
|
print "DO NOT INTERRUPT\n";
|
||||||
|
|
||||||
my $cmd = "dd if=/dev/zero bs=1M count=$CONFIG{'add'}k >> $path";
|
my $cmd = "dd if=/dev/zero bs=1M count=$CONFIG{'add'}k >> $path";
|
||||||
system($cmd );
|
system( $cmd );
|
||||||
}
|
}
|
||||||
elsif ( $CONFIG{ 'lvm' } )
|
elsif ( $CONFIG{'lvm'} )
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Make sure we can find the disk
|
# Make sure we can find the disk
|
||||||
#
|
#
|
||||||
$path = "/dev/" . $CONFIG{ 'lvm' } . "/" . $CONFIG{ 'hostname' } . "-disk";
|
$path = "/dev/" . $CONFIG{'lvm'} . "/" . $CONFIG{'hostname'} . "-disk";
|
||||||
if ( !-e $path )
|
if ( ! -e $path )
|
||||||
{
|
{
|
||||||
print <<EOF;
|
print <<EOF;
|
||||||
|
|
||||||
@@ -252,7 +246,7 @@ EOF
|
|||||||
#
|
#
|
||||||
# Allow panic
|
# Allow panic
|
||||||
#
|
#
|
||||||
if ( !$CONFIG{ 'force' } )
|
if ( !$CONFIG{'force'} )
|
||||||
{
|
{
|
||||||
foreach my $i ( 1 .. 10 )
|
foreach my $i ( 1 .. 10 )
|
||||||
{
|
{
|
||||||
@@ -264,7 +258,7 @@ EOF
|
|||||||
|
|
||||||
print "DO NOT INTERRUPT\n";
|
print "DO NOT INTERRUPT\n";
|
||||||
my $cmd = "lvextend -L+$CONFIG{'add'}M $path";
|
my $cmd = "lvextend -L+$CONFIG{'add'}M $path";
|
||||||
system($cmd );
|
system( $cmd );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -277,13 +271,13 @@ else
|
|||||||
# Check filesystem.
|
# Check filesystem.
|
||||||
#
|
#
|
||||||
print "Checking filesystem\n";
|
print "Checking filesystem\n";
|
||||||
system("fsck.ext3 -f $path");
|
system( "fsck.ext3 -f $path" );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Run ext3resize.
|
# Run ext3resize.
|
||||||
#
|
#
|
||||||
print "Resizing in place\n";
|
print "Resizing in place\n";
|
||||||
system("resize2fs $path");
|
system( "resize2fs $path" );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -304,16 +298,16 @@ exit 0;
|
|||||||
|
|
||||||
sub readConfigurationFile
|
sub readConfigurationFile
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ($file) = ( @_ );
|
||||||
|
|
||||||
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
||||||
|
|
||||||
my $line = "";
|
my $line = "";
|
||||||
|
|
||||||
while ( defined( $line = <FILE> ) )
|
while (defined($line = <FILE>) )
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ( $line =~ s/\\$// )
|
if ($line =~ s/\\$//)
|
||||||
{
|
{
|
||||||
$line .= <FILE>;
|
$line .= <FILE>;
|
||||||
redo unless eof(FILE);
|
redo unless eof(FILE);
|
||||||
@@ -323,7 +317,7 @@ sub readConfigurationFile
|
|||||||
next if ( $line =~ /^([ \t]*)\#/ );
|
next if ( $line =~ /^([ \t]*)\#/ );
|
||||||
|
|
||||||
# Skip blank lines
|
# Skip blank lines
|
||||||
next if ( length($line) < 1 );
|
next if ( length( $line ) < 1 );
|
||||||
|
|
||||||
# Strip trailing comments.
|
# Strip trailing comments.
|
||||||
if ( $line =~ /(.*)\#(.*)/ )
|
if ( $line =~ /(.*)\#(.*)/ )
|
||||||
@@ -346,7 +340,6 @@ sub readConfigurationFile
|
|||||||
# command expansion?
|
# command expansion?
|
||||||
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
||||||
{
|
{
|
||||||
|
|
||||||
# store
|
# store
|
||||||
my $pre = $1;
|
my $pre = $1;
|
||||||
my $cmd = $2;
|
my $cmd = $2;
|
||||||
@@ -354,7 +347,7 @@ sub readConfigurationFile
|
|||||||
|
|
||||||
# get output
|
# get output
|
||||||
my $output = `$cmd`;
|
my $output = `$cmd`;
|
||||||
chomp($output);
|
chomp( $output );
|
||||||
|
|
||||||
# build up replacement.
|
# build up replacement.
|
||||||
$val = $pre . $output . $post;
|
$val = $pre . $output . $post;
|
||||||
@@ -365,7 +358,7 @@ sub readConfigurationFile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -394,28 +387,27 @@ sub parseCommandLineArguments
|
|||||||
#
|
#
|
||||||
GetOptions(
|
GetOptions(
|
||||||
|
|
||||||
# Misc. options
|
# Misc. options
|
||||||
"add=s", \$CONFIG{ 'add' },
|
"add=s", \$CONFIG{'add'},
|
||||||
"dir=s", \$install{ 'dir' },
|
"dir=s", \$install{'dir'},
|
||||||
"domaindir=s",\$install{ 'domaindir' },
|
"lvm=s", \$install{'lvm'},
|
||||||
"lvm=s", \$install{ 'lvm' },
|
"hostname=s", \$CONFIG{'hostname'},
|
||||||
"hostname=s", \$CONFIG{ 'hostname' },
|
"force", \$CONFIG{'force'},
|
||||||
"force", \$CONFIG{ 'force' },
|
|
||||||
|
|
||||||
# Help options
|
# Help options
|
||||||
"help", \$HELP,
|
"help", \$HELP,
|
||||||
"manual", \$MANUAL,
|
"manual", \$MANUAL,
|
||||||
"verbose", \$CONFIG{ 'verbose' },
|
"verbose", \$CONFIG{'verbose'},
|
||||||
"version", \$VERSION
|
"version", \$VERSION
|
||||||
);
|
);
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
print("xen-resize-guest release $RELEASE\n");
|
print( "xen-resize-guest release $RELEASE\n" );
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -424,25 +416,17 @@ sub parseCommandLineArguments
|
|||||||
# they will allow the configuration values to be overriden by
|
# they will allow the configuration values to be overriden by
|
||||||
# the command line.
|
# the command line.
|
||||||
#
|
#
|
||||||
if ( $install{ 'lvm' } )
|
if ( $install{'lvm'} )
|
||||||
{
|
{
|
||||||
$CONFIG{ 'lvm' } = $install{ 'lvm' };
|
$CONFIG{'lvm'} = $install{'lvm'};
|
||||||
$CONFIG{ 'dir' } = undef;
|
$CONFIG{'dir'} = undef;
|
||||||
delete $CONFIG{ 'dir' };
|
delete $CONFIG{'dir'};
|
||||||
}
|
}
|
||||||
if ( $install{ 'dir' } )
|
if ( $install{'dir'} )
|
||||||
{
|
{
|
||||||
$CONFIG{ 'domaindir' } = $install{ 'dir' }.'/domains';
|
$CONFIG{'dir'} = $install{'dir'};
|
||||||
$CONFIG{ 'dir' } = undef;
|
$CONFIG{'lvm'} = undef;
|
||||||
$CONFIG{ 'lvm' } = undef;
|
delete $CONFIG{'lvm'};
|
||||||
delete $CONFIG{ 'lvm' };
|
|
||||||
}
|
|
||||||
if ( $install{ 'domaindir' } )
|
|
||||||
{
|
|
||||||
$CONFIG{ 'domaindir' } = $install{ 'domaindir' };
|
|
||||||
$CONFIG{ 'dir' } = undef;
|
|
||||||
$CONFIG{ 'lvm' } = undef;
|
|
||||||
delete $CONFIG{ 'lvm' };
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -458,11 +442,10 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub testArguments
|
sub testArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Make sure we received a hostname.
|
# Make sure we received a hostname.
|
||||||
#
|
#
|
||||||
if ( !$CONFIG{ 'hostname' } )
|
if ( !$CONFIG{'hostname'} )
|
||||||
{
|
{
|
||||||
print <<EOF;
|
print <<EOF;
|
||||||
|
|
||||||
@@ -477,7 +460,7 @@ EOF
|
|||||||
#
|
#
|
||||||
# Make sure we received a size.
|
# Make sure we received a size.
|
||||||
#
|
#
|
||||||
if ( !$CONFIG{ 'add' } )
|
if ( !$CONFIG{'add'} )
|
||||||
{
|
{
|
||||||
print <<EOF;
|
print <<EOF;
|
||||||
|
|
||||||
@@ -493,7 +476,7 @@ EOF
|
|||||||
#
|
#
|
||||||
# Make sure the guest isn't running
|
# Make sure the guest isn't running
|
||||||
#
|
#
|
||||||
if ( xenRunning( $CONFIG{ 'hostname' } ) )
|
if ( xenRunning( $CONFIG{'hostname'} ) )
|
||||||
{
|
{
|
||||||
print "The guest $CONFIG{'hostname'} appears to be running!\n";
|
print "The guest $CONFIG{'hostname'} appears to be running!\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -503,37 +486,33 @@ EOF
|
|||||||
# We should either have LVM *or* directory - not neither or both.
|
# We should either have LVM *or* directory - not neither or both.
|
||||||
#
|
#
|
||||||
my $options = 0;
|
my $options = 0;
|
||||||
$options += 1
|
$options += 1if ( defined($CONFIG{'lvm'}) && length( $CONFIG{'lvm'} ) );
|
||||||
if ( defined( $CONFIG{ 'lvm' } ) && length( $CONFIG{ 'lvm' } ) );
|
$options += 1if ( defined($CONFIG{'dir'}) && length( $CONFIG{'dir'} ) );
|
||||||
$options += 1
|
|
||||||
if ( defined( $CONFIG{ 'dir' } ) && length( $CONFIG{ 'dir' } ) );
|
|
||||||
$options += 1
|
|
||||||
if ( defined( $CONFIG{ 'domaindir' } ) && length( $CONFIG{ 'domaindir' } ) );
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Report
|
# Report
|
||||||
#
|
#
|
||||||
if ( $options == 0 )
|
if ( $options == 0 )
|
||||||
{
|
{
|
||||||
print "Please specify one of --lvm, --domaindir or --dir\n";
|
print "Please specify one of --lvm or --dir\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
if ( $options > 1 )
|
if ( $options > 1 )
|
||||||
{
|
{
|
||||||
print "Please specify only one of --lvm, --domaindir or --dir - not several of them!\n";
|
print "Please specify only one of --lvm or --dir - not both!\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Convert from Gb -> Mb;
|
# Convert from Gb -> Mb;
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'add' } =~ /^([0-9.]+)Gb*$/i )
|
if ( $CONFIG{'add'} =~ /^([0-9.]+)Gb*$/i )
|
||||||
{
|
{
|
||||||
$CONFIG{ 'add' } = $1 * 1024;
|
$CONFIG{'add'} = $1 * 1024;
|
||||||
}
|
}
|
||||||
if ( $CONFIG{ 'add' } =~ /^([0-9.]+)Mb*$/i )
|
if ( $CONFIG{'add'} =~ /^([0-9.]+)Mb*$/i )
|
||||||
{
|
{
|
||||||
$CONFIG{ 'add' } = $1;
|
$CONFIG{'add'} = $1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -549,18 +528,18 @@ EOF
|
|||||||
|
|
||||||
sub xenRunning
|
sub xenRunning
|
||||||
{
|
{
|
||||||
my ($hostname) = (@_);
|
my( $hostname ) = (@_ );
|
||||||
|
|
||||||
my $running = 0;
|
my $running = 0;
|
||||||
|
|
||||||
open( CMD, "xm list $hostname 2>/dev/null |" ) or
|
open( CMD, "xm list $hostname 2>/dev/null |")
|
||||||
die "Failed to run 'xm list $hostname'";
|
or die "Failed to run 'xm list $hostname'";
|
||||||
while (<CMD>)
|
while( <CMD> )
|
||||||
{
|
{
|
||||||
my $line = $_;
|
my $line = $_;
|
||||||
$running = 1 if ( $line =~ /\Q$hostname\E/ );
|
$running = 1 if ( $line =~ /\Q$hostname\E/ )
|
||||||
}
|
}
|
||||||
close(CMD);
|
close( CMD );
|
||||||
|
|
||||||
return ($running);
|
return( $running );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,8 +14,7 @@ xen-update-image - Update the software installed upon offline Xen images.
|
|||||||
--version Show the version number and exit.
|
--version Show the version number and exit.
|
||||||
|
|
||||||
General Options:
|
General Options:
|
||||||
--dir Specify the directory which contains the image(s). (old style)
|
--dir Specify the directory which contains the image(s).
|
||||||
--domaindir Specify the directory which contains the image(s). (new style)
|
|
||||||
--lvm Specify the LVM volume group which contains the image(s).
|
--lvm Specify the LVM volume group which contains the image(s).
|
||||||
--evms Specify the EVMS container which contains the image(s).
|
--evms Specify the EVMS container which contains the image(s).
|
||||||
|
|
||||||
@@ -28,14 +27,7 @@ xen-update-image - Update the software installed upon offline Xen images.
|
|||||||
=over 8
|
=over 8
|
||||||
|
|
||||||
=item B<--dir>
|
=item B<--dir>
|
||||||
Specify the directory which contains the image(s). Looks
|
Specify the directory which contains the image(s).
|
||||||
for directories named after the hostname in a subdirectory
|
|
||||||
"domains". (old style, see xen-create-image(1) for details)
|
|
||||||
|
|
||||||
=item B<--domaindir>
|
|
||||||
Specify the directory which contains the image(s). Looks
|
|
||||||
for directories named after the hostname directorly in this
|
|
||||||
directory. (new style, see xen-create-image(1) for details)
|
|
||||||
|
|
||||||
=item B<--evms>
|
=item B<--evms>
|
||||||
Specify the EVMS container which contains the image(s).
|
Specify the EVMS container which contains the image(s).
|
||||||
@@ -100,7 +92,7 @@ Show the version number and exit.
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -128,7 +120,7 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -136,7 +128,7 @@ my $RELEASE = '4.2rc1';
|
|||||||
#
|
#
|
||||||
if ( -e "/etc/xen-tools/xen-tools.conf" )
|
if ( -e "/etc/xen-tools/xen-tools.conf" )
|
||||||
{
|
{
|
||||||
readConfigurationFile("/etc/xen-tools/xen-tools.conf");
|
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -174,11 +166,11 @@ E_O_ROOT
|
|||||||
#
|
#
|
||||||
# Loop over the supplied arguments, and attempt to update each image.
|
# Loop over the supplied arguments, and attempt to update each image.
|
||||||
#
|
#
|
||||||
while ( my $name = shift )
|
while( my $name = shift )
|
||||||
{
|
{
|
||||||
if ( !xenRunning($name) )
|
if ( !xenRunning( $name ) )
|
||||||
{
|
{
|
||||||
updateXenImage($name);
|
updateXenImage( $name );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -204,7 +196,7 @@ exit;
|
|||||||
|
|
||||||
sub updateXenImage
|
sub updateXenImage
|
||||||
{
|
{
|
||||||
my ($name) = (@_);
|
my ( $name ) = ( @_ );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Create a temporary directory, and prepare to mount the
|
# Create a temporary directory, and prepare to mount the
|
||||||
@@ -218,13 +210,12 @@ sub updateXenImage
|
|||||||
# If we're dealing with loopback images find the main one,
|
# If we're dealing with loopback images find the main one,
|
||||||
# and mount it.
|
# and mount it.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'dir' } )
|
if ( $CONFIG{'dir'} )
|
||||||
{
|
{
|
||||||
|
|
||||||
# The loopback image.
|
# The loopback image.
|
||||||
$img = $CONFIG{ 'domaindir' } . '/' . $name . "/disk.img";
|
$img = $CONFIG{'dir'} . "/domains/" . $name . "/disk.img";
|
||||||
|
|
||||||
if ( !-e $img )
|
if ( ! -e $img )
|
||||||
{
|
{
|
||||||
print "Disk image '$img' for host '$name' not found\n";
|
print "Disk image '$img' for host '$name' not found\n";
|
||||||
return;
|
return;
|
||||||
@@ -232,14 +223,13 @@ sub updateXenImage
|
|||||||
|
|
||||||
$mount_cmd = "mount -t auto -o loop $img $tmp";
|
$mount_cmd = "mount -t auto -o loop $img $tmp";
|
||||||
}
|
}
|
||||||
elsif ( $CONFIG{ 'lvm' } )
|
elsif ( $CONFIG{'lvm'} )
|
||||||
{
|
{
|
||||||
|
|
||||||
# The LVM volume
|
# The LVM volume
|
||||||
$img = "/dev/" . $CONFIG{ 'lvm' } . "/$name-disk";
|
$img = "/dev/" . $CONFIG{'lvm'} . "/$name-disk";
|
||||||
|
|
||||||
# make sure it exists.
|
# make sure it exists.
|
||||||
if ( !-e $img )
|
if ( ! -e $img )
|
||||||
{
|
{
|
||||||
print "Logical volume '$img' for host '$name' not found\n";
|
print "Logical volume '$img' for host '$name' not found\n";
|
||||||
return;
|
return;
|
||||||
@@ -247,31 +237,25 @@ sub updateXenImage
|
|||||||
|
|
||||||
$mount_cmd = "mount -t auto $img $tmp";
|
$mount_cmd = "mount -t auto $img $tmp";
|
||||||
}
|
}
|
||||||
elsif ( $CONFIG{ 'evms' } )
|
elsif ( $CONFIG{'evms'} )
|
||||||
{
|
{
|
||||||
|
# The EVMS volume -- note, unlike LVM, you don't need the $CONFIG{'evms'}
|
||||||
|
# to see it and mount the volume. $CONFIG{'evms'} is only used for manipulating
|
||||||
|
# the underlying object. Still, I don't want to mess with the parse code and
|
||||||
|
# make it confusing - otherwise --evms takes an argument everywhere but here,
|
||||||
|
# which will confuse users. The better solution is to make it so that --evms can
|
||||||
|
# take a following container, but doesn't require it. For the moment, it is
|
||||||
|
# better to leave it as it is, take a container, and then ignore it.
|
||||||
|
|
||||||
# The EVMS volume -- note, unlike LVM, you don't need the
|
# The best way to do it is to just read it out of the configuration file,
|
||||||
# $CONFIG{'evms'} to see it and mount the
|
# tell the user what you got and where you got it from, and not bother the user
|
||||||
# volume. $CONFIG{'evms'} is only used for manipulating the
|
# with picking --dir or --lvm or --evms at all, but infer it from the config
|
||||||
# underlying object. Still, I don't want to mess with the
|
# file's disk = parameter. xen-delete-image might work the same way, but
|
||||||
# parse code and make it confusing - otherwise --evms takes an
|
# it could be *slightly* more dangerous in the context of deleting.
|
||||||
# argument everywhere but here, which will confuse users. The
|
|
||||||
# better solution is to make it so that --evms can take a
|
|
||||||
# following container, but doesn't require it. For the
|
|
||||||
# moment, it is better to leave it as it is, take a container,
|
|
||||||
# and then ignore it.
|
|
||||||
|
|
||||||
# The best way to do it is to just read it out of the
|
|
||||||
# configuration file, tell the user what you got and where you
|
|
||||||
# got it from, and not bother the user with picking --dir or
|
|
||||||
# --lvm or --evms at all, but infer it from the config file's
|
|
||||||
# disk = parameter. xen-delete-image might work the same way,
|
|
||||||
# but it could be *slightly* more dangerous in the context of
|
|
||||||
# deleting.
|
|
||||||
$img = "/dev/evms/$name-disk";
|
$img = "/dev/evms/$name-disk";
|
||||||
|
|
||||||
# make sure it exists.
|
# make sure it exists.
|
||||||
if ( !-e $img )
|
if ( ! -e $img )
|
||||||
{
|
{
|
||||||
print "EVMS volume '$img' for host '$name' not found\n";
|
print "EVMS volume '$img' for host '$name' not found\n";
|
||||||
return;
|
return;
|
||||||
@@ -295,23 +279,20 @@ sub updateXenImage
|
|||||||
if ( ( -e $tmp . "/usr/bin/apt-get" ) &&
|
if ( ( -e $tmp . "/usr/bin/apt-get" ) &&
|
||||||
( -x $tmp . "/usr/bin/apt-get" ) )
|
( -x $tmp . "/usr/bin/apt-get" ) )
|
||||||
{
|
{
|
||||||
|
#
|
||||||
#
|
# Now run the update command.
|
||||||
# Now run the update command.
|
#
|
||||||
#
|
system( "chroot $tmp /usr/bin/apt-get update" );
|
||||||
system("chroot $tmp /usr/bin/apt-get update");
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Now upgrade
|
# Now upgrade
|
||||||
#
|
#
|
||||||
system(
|
system( "DEBIAN_FRONTEND=noninteractive chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes" );
|
||||||
"DEBIAN_FRONTEND=noninteractive chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Xen image $name is not a Debian GNU/Linux image. Skipping\n";
|
print "Xen image $name is not a Debian GNU/Linux image. Skipping\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -325,6 +306,8 @@ sub updateXenImage
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Test to see if the given instance is running.
|
Test to see if the given instance is running.
|
||||||
@@ -335,24 +318,25 @@ sub updateXenImage
|
|||||||
|
|
||||||
sub xenRunning
|
sub xenRunning
|
||||||
{
|
{
|
||||||
my ($hostname) = (@_);
|
my( $hostname ) = (@_ );
|
||||||
|
|
||||||
my $running = 0;
|
my $running = 0;
|
||||||
|
|
||||||
open( CMD, "xm list 2>/dev/null |" ) or
|
open( CMD, "xm list 2>/dev/null |")
|
||||||
die "Failed to run 'xm list $hostname'";
|
or die "Failed to run 'xm list $hostname'";
|
||||||
while (<CMD>)
|
while( <CMD> )
|
||||||
{
|
{
|
||||||
my $line = $_;
|
my $line = $_;
|
||||||
$running = 1 if ( $line =~ /\Q$hostname\E/ );
|
$running = 1 if ( $line =~ /\Q$hostname\E/ )
|
||||||
}
|
}
|
||||||
close(CMD);
|
close( CMD );
|
||||||
|
|
||||||
return ($running);
|
return( $running );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Read the configuration file specified.
|
Read the configuration file specified.
|
||||||
@@ -363,16 +347,16 @@ sub xenRunning
|
|||||||
|
|
||||||
sub readConfigurationFile
|
sub readConfigurationFile
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ($file) = ( @_ );
|
||||||
|
|
||||||
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
||||||
|
|
||||||
my $line = "";
|
my $line = "";
|
||||||
|
|
||||||
while ( defined( $line = <FILE> ) )
|
while (defined($line = <FILE>) )
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ( $line =~ s/\\$// )
|
if ($line =~ s/\\$//)
|
||||||
{
|
{
|
||||||
$line .= <FILE>;
|
$line .= <FILE>;
|
||||||
redo unless eof(FILE);
|
redo unless eof(FILE);
|
||||||
@@ -382,7 +366,7 @@ sub readConfigurationFile
|
|||||||
next if ( $line =~ /^([ \t]*)\#/ );
|
next if ( $line =~ /^([ \t]*)\#/ );
|
||||||
|
|
||||||
# Skip blank lines
|
# Skip blank lines
|
||||||
next if ( length($line) < 1 );
|
next if ( length( $line ) < 1 );
|
||||||
|
|
||||||
# Strip trailing comments.
|
# Strip trailing comments.
|
||||||
if ( $line =~ /(.*)\#(.*)/ )
|
if ( $line =~ /(.*)\#(.*)/ )
|
||||||
@@ -405,7 +389,6 @@ sub readConfigurationFile
|
|||||||
# command expansion?
|
# command expansion?
|
||||||
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
||||||
{
|
{
|
||||||
|
|
||||||
# store
|
# store
|
||||||
my $pre = $1;
|
my $pre = $1;
|
||||||
my $cmd = $2;
|
my $cmd = $2;
|
||||||
@@ -413,7 +396,7 @@ sub readConfigurationFile
|
|||||||
|
|
||||||
# get output
|
# get output
|
||||||
my $output = `$cmd`;
|
my $output = `$cmd`;
|
||||||
chomp($output);
|
chomp( $output );
|
||||||
|
|
||||||
# build up replacement.
|
# build up replacement.
|
||||||
$val = $pre . $output . $post;
|
$val = $pre . $output . $post;
|
||||||
@@ -424,11 +407,12 @@ sub readConfigurationFile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Parse the arguments specified upon the command line.
|
Parse the arguments specified upon the command line.
|
||||||
@@ -445,18 +429,21 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
# Parse options.
|
# Parse options.
|
||||||
#
|
#
|
||||||
GetOptions( "dir=s", \$CONFIG{ 'dir' }, "lvm=s", \$CONFIG{ 'lvm' },
|
GetOptions(
|
||||||
"domaindir=s", \$CONFIG{ 'dir' },
|
"dir=s", \$CONFIG{'dir'},
|
||||||
"evms=s", \$CONFIG{ 'evms' }, "help", \$HELP,
|
"lvm=s", \$CONFIG{'lvm'},
|
||||||
"manual", \$MANUAL, "version", \$VERSION
|
"evms=s", \$CONFIG{'evms'},
|
||||||
);
|
"help", \$HELP,
|
||||||
|
"manual", \$MANUAL,
|
||||||
|
"version", \$VERSION
|
||||||
|
);
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.29 $';
|
my $REVISION = '$Revision: 1.29 $';
|
||||||
|
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
@@ -466,11 +453,6 @@ sub parseCommandLineArguments
|
|||||||
exit;
|
exit;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($CONFIG{ 'dir' }) {
|
|
||||||
$CONFIG{ 'domaindir' } = $CONFIG{ 'dir' }.'/domains';
|
|
||||||
$CONFIG{ 'dir' } = undef;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -486,14 +468,13 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub checkArguments
|
sub checkArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Make sure we got one and only one installation method.
|
# Make sure we got one and only one installation method.
|
||||||
#
|
#
|
||||||
my $count = 0;
|
my $count = 0;
|
||||||
foreach my $type (qw/dir domaindir lvm evms/)
|
foreach my $type ( qw/dir lvm evms/ )
|
||||||
{
|
{
|
||||||
$count += 1 if defined( $CONFIG{ $type } );
|
$count += 1 if defined( $CONFIG{$type} );
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -502,11 +483,10 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
if ( $count != 1 )
|
if ( $count != 1 )
|
||||||
{
|
{
|
||||||
print "Please select one and only one of the installation methods:\n";
|
print "Please select one and only one of the installation methods:\n";
|
||||||
print " --dir\n";
|
print " --dir\n";
|
||||||
print " --domaindir\n";
|
print " --evms\n";
|
||||||
print " --evms\n";
|
print " --lvm\n";
|
||||||
print " --lvm\n";
|
exit;
|
||||||
exit;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ xt-create-config - Create a Xen configuration file for a new guest
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -150,13 +150,14 @@ my @PARTITIONS = undef;
|
|||||||
#
|
#
|
||||||
# Default options
|
# Default options
|
||||||
#
|
#
|
||||||
$CONFIG{ 'template' } = '/etc/xen-tools/xm.tmpl';
|
$CONFIG{'template'} = '/etc/xen-tools/xm.tmpl';
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -175,7 +176,7 @@ checkArguments();
|
|||||||
#
|
#
|
||||||
# If we've been given any administrators then set them up.
|
# If we've been given any administrators then set them up.
|
||||||
#
|
#
|
||||||
if ( $ENV{ 'admins' } )
|
if ( $ENV{'admins'} )
|
||||||
{
|
{
|
||||||
setupAdminUsers();
|
setupAdminUsers();
|
||||||
}
|
}
|
||||||
@@ -188,6 +189,9 @@ createXenConfig();
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Exit cleanly - any errors which have already occurred will result
|
# Exit cleanly - any errors which have already occurred will result
|
||||||
# in "exit 1".
|
# in "exit 1".
|
||||||
@@ -196,6 +200,9 @@ exit 0;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Parse the command line arguments this script was given.
|
Parse the command line arguments this script was given.
|
||||||
@@ -213,23 +220,24 @@ sub parseCommandLineArguments
|
|||||||
#
|
#
|
||||||
# Parse options.
|
# Parse options.
|
||||||
#
|
#
|
||||||
GetOptions( "admins=s", \$ENV{ 'admins' },
|
GetOptions(
|
||||||
"output=s", \$CONFIG{ 'output' },
|
"admins=s", \$ENV{'admins'},
|
||||||
"extension=s", \$CONFIG{ 'extension' },
|
"output=s", \$CONFIG{'output'},
|
||||||
"template=s", \$CONFIG{ 'template' },
|
"extension=s",\$CONFIG{'extension'},
|
||||||
"verbose", \$CONFIG{ 'verbose' },
|
"template=s", \$CONFIG{'template'},
|
||||||
"help", \$HELP,
|
"verbose", \$CONFIG{'verbose'},
|
||||||
"manual", \$MANUAL,
|
"help", \$HELP,
|
||||||
"version", \$VERSION
|
"manual", \$MANUAL,
|
||||||
|
"version", \$VERSION
|
||||||
);
|
);
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.47 $';
|
my $REVISION = '$Revision: 1.47 $';
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
$REVISION = $1;
|
$REVISION = $1;
|
||||||
@@ -252,11 +260,10 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub checkArguments
|
sub checkArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# We require an output location.
|
# We require an output location.
|
||||||
#
|
#
|
||||||
if ( !defined( $CONFIG{ 'output' } ) )
|
if ( ! defined( $CONFIG{'output'} ) )
|
||||||
{
|
{
|
||||||
print "The '--output' argument is mandatory\n";
|
print "The '--output' argument is mandatory\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -265,10 +272,9 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
# The output location should be a directory which exists.
|
# The output location should be a directory which exists.
|
||||||
#
|
#
|
||||||
if ( !-d $CONFIG{ 'output' } )
|
if ( ! -d $CONFIG{'output'} )
|
||||||
{
|
{
|
||||||
print
|
print "The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
|
||||||
"The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
|
|
||||||
print "Aborting\n";
|
print "Aborting\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
@@ -276,12 +282,11 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
# Make sure that any specified template file exists.
|
# Make sure that any specified template file exists.
|
||||||
#
|
#
|
||||||
if ( defined( $CONFIG{ 'template' } ) )
|
if ( defined( $CONFIG{'template'} ) )
|
||||||
{
|
{
|
||||||
if ( !-e $CONFIG{ 'template' } )
|
if ( ! -e $CONFIG{'template'} )
|
||||||
{
|
{
|
||||||
print
|
print "The specified template file, $CONFIG{'template'} does not exist.\n";
|
||||||
"The specified template file, $CONFIG{'template'} does not exist.\n";
|
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -305,17 +310,20 @@ sub importPartitionsFromEnvironment
|
|||||||
{
|
{
|
||||||
@PARTITIONS = ();
|
@PARTITIONS = ();
|
||||||
|
|
||||||
for ( my $i = 1 ; $i <= $ENV{ 'NUMPARTITIONS' } ; $i++ )
|
for (my $i=1; $i <= $ENV{'NUMPARTITIONS'}; $i++)
|
||||||
{
|
{
|
||||||
my @parts = split( /:/, $ENV{ 'PARTITION' . $i }, 7 );
|
my @parts = split(/:/, $ENV{'PARTITION' . $i}, 7);
|
||||||
push( @PARTITIONS,
|
push( @PARTITIONS,
|
||||||
{ 'name' => $parts[0],
|
{
|
||||||
'size' => $parts[1],
|
'name' => $parts[0],
|
||||||
'type' => $parts[2],
|
'size' => $parts[1],
|
||||||
'mountpoint' => $parts[3],
|
'type' => $parts[2],
|
||||||
'options' => $parts[4],
|
'mountpoint' => $parts[3],
|
||||||
'imagetype' => $parts[5],
|
'options' => $parts[4],
|
||||||
'image' => $parts[6] } );
|
'imagetype' => $parts[5],
|
||||||
|
'image' => $parts[6]
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,35 +341,29 @@ sub importPartitionsFromEnvironment
|
|||||||
|
|
||||||
sub createXenConfig
|
sub createXenConfig
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# The output file we're going to process.
|
# The output file we're going to process.
|
||||||
#
|
#
|
||||||
my $file =
|
my $file = $CONFIG{'output'} . '/' . $ENV{'hostname'} . $ENV{'extension'};
|
||||||
$CONFIG{ 'output' } . '/' . $ENV{ 'hostname' } . $ENV{ 'extension' };
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# The template we're going to read from.
|
# The template we're going to read from.
|
||||||
#
|
#
|
||||||
my $template = new Text::Template( TYPE => 'FILE',
|
my $template = new Text::Template( TYPE => 'FILE',
|
||||||
SOURCE => $CONFIG{ 'template' } );
|
SOURCE => $CONFIG{'template'} );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# The device we're using.
|
# The device we're using.
|
||||||
#
|
#
|
||||||
my $device = 'xvda';
|
my $device = 'sda';
|
||||||
if ( defined( $ENV{ 'ide' } ) )
|
if ( defined( $ENV{'ide'} ) )
|
||||||
{
|
{
|
||||||
$device = 'hda';
|
$device = 'hda';
|
||||||
}
|
}
|
||||||
elsif ( defined( $ENV{ 'scsi' } ) )
|
elsif ( defined( $ENV{'disk_device'} ) )
|
||||||
{
|
{
|
||||||
$device = 'sda';
|
$device = $ENV{'disk_device'};
|
||||||
}
|
|
||||||
elsif ( defined( $ENV{ 'disk_device' } ) )
|
|
||||||
{
|
|
||||||
$device = $ENV{ 'disk_device' };
|
|
||||||
|
|
||||||
# strip /dev/, if present.
|
# strip /dev/, if present.
|
||||||
if ( $device =~ /^(.*)\/(.*)$/ )
|
if ( $device =~ /^(.*)\/(.*)$/ )
|
||||||
@@ -369,65 +371,65 @@ sub createXenConfig
|
|||||||
$device = $2;
|
$device = $2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$ENV{ 'device' } = $device;
|
$ENV{'device'} = $device;
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# The memory size: Convert Gb -> Mb.
|
# The memory size: Convert Gb -> Mb.
|
||||||
#
|
#
|
||||||
if ( $ENV{ 'memory' } =~ /^(\d+)Gb*$/i )
|
if ( $ENV{'memory'} =~ /^(\d+)Gb*$/i )
|
||||||
{
|
{
|
||||||
$ENV{ 'memory' } = $1 * 1024;
|
$ENV{'memory'} = $1 * 1024;
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Remove any trailing Mb.
|
# Remove any trailing Mb.
|
||||||
#
|
#
|
||||||
if ( $ENV{ 'memory' } =~ /^(\d+)Mb*$/i )
|
if ( $ENV{'memory'} =~ /^(\d+)Mb*$/i )
|
||||||
{
|
{
|
||||||
$ENV{ 'memory' } = $1;
|
$ENV{'memory'} = $1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Images as presented to Xen - either loopback images, or LVM partitions.
|
# Images as presented to Xen - either loopback images, or LVM partitions.
|
||||||
#
|
#
|
||||||
if ( $ENV{ 'lvm' } )
|
if ( $ENV{'lvm'} )
|
||||||
{
|
{
|
||||||
$ENV{ 'image_prefix' } = "phy:$ENV{'lvm'}/$ENV{'hostname'}-";
|
$ENV{'image_prefix'} = "phy:$ENV{'lvm'}/$ENV{'hostname'}-";
|
||||||
$ENV{ 'image_suffix' } = '';
|
$ENV{'image_suffix'} = '';
|
||||||
importPartitionsFromEnvironment();
|
importPartitionsFromEnvironment();
|
||||||
}
|
}
|
||||||
elsif ( $ENV{ 'evms' } )
|
elsif ( $ENV{'evms'} )
|
||||||
{
|
{
|
||||||
$ENV{ 'image_prefix' } = "phy:/dev/evms/$ENV{'hostname'}-";
|
$ENV{'image_prefix'} = "phy:/dev/evms/$ENV{'hostname'}-";
|
||||||
$ENV{ 'image_suffix' } = '';
|
$ENV{'image_suffix'} = '';
|
||||||
importPartitionsFromEnvironment();
|
importPartitionsFromEnvironment();
|
||||||
}
|
}
|
||||||
elsif ( $ENV{ 'image-dev' } )
|
elsif ( $ENV{'image-dev'} )
|
||||||
{
|
{
|
||||||
$ENV{ 'image_vbd' } = "phy:$ENV{'image-dev'}";
|
$ENV{'image_vbd'} = "phy:$ENV{'image-dev'}";
|
||||||
|
|
||||||
if ( $ENV{ 'swap-dev' } )
|
if ( $ENV{'swap-dev'} )
|
||||||
{
|
{
|
||||||
$ENV{ 'swap_vbd' } = "phy:$ENV{'swap-dev'}";
|
$ENV{'swap_vbd'} = "phy:$ENV{'swap-dev'}";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$ENV{ 'swap_vbd' } = undef;
|
$ENV{'swap_vbd'} = undef;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$ENV{ 'image_prefix' } = "file:$ENV{'domaindir'}/$ENV{'hostname'}/";
|
$ENV{'image_prefix'} = "file:$ENV{'dir'}/domains/$ENV{'hostname'}/";
|
||||||
$ENV{ 'image_suffix' } = '.img';
|
$ENV{'image_suffix'} = '.img';
|
||||||
importPartitionsFromEnvironment();
|
importPartitionsFromEnvironment();
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# The xen-tools version.
|
# The xen-tools version.
|
||||||
#
|
#
|
||||||
$ENV{ 'xen_tools_version' } = $RELEASE;
|
$ENV{'xen_tools_version'} = $RELEASE;
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -436,11 +438,11 @@ sub createXenConfig
|
|||||||
# made available to our template file.
|
# made available to our template file.
|
||||||
#
|
#
|
||||||
my %vars;
|
my %vars;
|
||||||
foreach my $key ( sort keys %ENV )
|
foreach my $key (sort keys %ENV )
|
||||||
{
|
{
|
||||||
$vars{ $key } = $ENV{ $key };
|
$vars{$key} = $ENV{$key};
|
||||||
}
|
}
|
||||||
$vars{ 'PARTITIONS' } = \@PARTITIONS;
|
$vars{'PARTITIONS'} = \@PARTITIONS;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Now output the data.
|
# Now output the data.
|
||||||
@@ -455,9 +457,9 @@ sub createXenConfig
|
|||||||
#
|
#
|
||||||
# Write the output of processing the template file, if it succeeds.
|
# Write the output of processing the template file, if it succeeds.
|
||||||
#
|
#
|
||||||
if ( defined $result )
|
if (defined $result)
|
||||||
{
|
{
|
||||||
print FILE $result;
|
print FILE $result ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -467,12 +469,13 @@ sub createXenConfig
|
|||||||
#
|
#
|
||||||
# Close the output file.
|
# Close the output file.
|
||||||
#
|
#
|
||||||
close(FILE);
|
close( FILE );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
This routine is designed to ensure that any users specified with
|
This routine is designed to ensure that any users specified with
|
||||||
@@ -484,7 +487,6 @@ sub createXenConfig
|
|||||||
|
|
||||||
sub setupAdminUsers
|
sub setupAdminUsers
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we're not root we can't modify users.
|
# If we're not root we can't modify users.
|
||||||
#
|
#
|
||||||
@@ -493,26 +495,24 @@ sub setupAdminUsers
|
|||||||
#
|
#
|
||||||
# If we don't have a sudoers file then we'll also ignore this.
|
# If we don't have a sudoers file then we'll also ignore this.
|
||||||
#
|
#
|
||||||
return if ( !-e "/etc/sudoers" );
|
return if ( ! -e "/etc/sudoers" );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Find the path to the xen-login-shell
|
# Find the path to the xen-login-shell
|
||||||
#
|
#
|
||||||
my $shell = undef;
|
my $shell = undef;
|
||||||
$shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
|
$shell = "/usr/bin/xen-login-shell" if ( -x "/usr/bin/xen-login-shell" );
|
||||||
$shell = "/usr/local/bin/xen-login-shell"
|
$shell = "/usr/local/bin/xen-login-shell" if ( -x "/usr/bin/local/xen-login-shell" );
|
||||||
if ( -x "/usr/bin/local/xen-login-shell" );
|
|
||||||
|
|
||||||
return if ( !defined($shell) );
|
return if ( !defined( $shell ) );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# For each user make sure they exist, and setup the
|
# For each user make sure they exist, and setup the
|
||||||
# login shell for them.
|
# login shell for them.
|
||||||
#
|
#
|
||||||
foreach my $user ( split( /,/, $ENV{ 'admins' } ) )
|
foreach my $user ( split( /,/, $ENV{'admins'} ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
# Strip leading and trailing whitespace.
|
# Strip leading and trailing whitespace.
|
||||||
$user =~ s/^\s+//;
|
$user =~ s/^\s+//;
|
||||||
$user =~ s/\s+$//;
|
$user =~ s/\s+$//;
|
||||||
@@ -523,27 +523,23 @@ sub setupAdminUsers
|
|||||||
# Does the user exist?
|
# Does the user exist?
|
||||||
if ( getpwnam($user) )
|
if ( getpwnam($user) )
|
||||||
{
|
{
|
||||||
|
|
||||||
# Change shell.
|
# Change shell.
|
||||||
$CONFIG{ 'verbose' } && print "Changing shell for $user: $shell\n";
|
$CONFIG{'verbose'} && print "Changing shell for $user: $shell\n";
|
||||||
system( "chsh", "-s", $shell, $user );
|
system( "chsh", "-s", $shell, $user );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
# Add a new user.
|
# Add a new user.
|
||||||
$CONFIG{ 'verbose' } && print "Adding new user: $user\n";
|
$CONFIG{'verbose'} && print "Adding new user: $user\n";
|
||||||
system( "useradd", "-s", $shell, $user );
|
system( "useradd", "-s", $shell, $user );
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Add the entry to /etc/sudoers.
|
# Add the entry to /etc/sudoers.
|
||||||
#
|
#
|
||||||
open( SUDOERS, ">>", "/etc/sudoers" ) or
|
open( SUDOERS, ">>", "/etc/sudoers" ) or warn "Failed to add user to sudoers file : $user - $!";
|
||||||
warn "Failed to add user to sudoers file : $user - $!";
|
print SUDOERS "$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
|
||||||
print SUDOERS
|
close( SUDOERS );
|
||||||
"$user ALL = NOPASSWD: /usr/sbin/xm, /usr/bin/xen-create-image\n";
|
|
||||||
close(SUDOERS);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -97,7 +97,8 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -127,6 +128,9 @@ exit 0;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Parse the command line arguments this script was given.
|
Parse the command line arguments this script was given.
|
||||||
@@ -144,28 +148,29 @@ sub parseCommandLineArguments
|
|||||||
#
|
#
|
||||||
# Parse options.
|
# Parse options.
|
||||||
#
|
#
|
||||||
GetOptions( "location=s", \$CONFIG{ 'location' },
|
GetOptions(
|
||||||
"dist=s", \$CONFIG{ 'dist' },
|
"location=s", \$CONFIG{'location'},
|
||||||
"verbose", \$CONFIG{ 'verbose' },
|
"dist=s", \$CONFIG{'dist'},
|
||||||
"help", \$HELP,
|
"verbose", \$CONFIG{'verbose'},
|
||||||
"manual", \$MANUAL,
|
"help", \$HELP,
|
||||||
"version", \$VERSION
|
"manual", \$MANUAL,
|
||||||
);
|
"version", \$VERSION
|
||||||
|
);
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.33 $';
|
my $REVISION = '$Revision: 1.33 $';
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
$REVISION = $1;
|
$REVISION = $1;
|
||||||
}
|
}
|
||||||
|
|
||||||
print "xt-customize-image release $RELEASE - CVS: $REVISION\n";
|
print "xt-customize-image release $RELEASE - CVS: $REVISION\n";
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,11 +186,10 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub checkArguments
|
sub checkArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# We require a location.
|
# We require a location.
|
||||||
#
|
#
|
||||||
if ( !defined( $CONFIG{ 'location' } ) )
|
if ( ! defined( $CONFIG{'location'} ) )
|
||||||
{
|
{
|
||||||
print "The '--location' argument is mandatory\n";
|
print "The '--location' argument is mandatory\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -195,7 +199,7 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
# Test that the location we've been given exists
|
# Test that the location we've been given exists
|
||||||
#
|
#
|
||||||
if ( !-d $CONFIG{ 'location' } )
|
if ( ! -d $CONFIG{'location'} )
|
||||||
{
|
{
|
||||||
print "The installation directory we've been given doesn't exist\n";
|
print "The installation directory we've been given doesn't exist\n";
|
||||||
print "We tried to use : $CONFIG{'location'}\n";
|
print "We tried to use : $CONFIG{'location'}\n";
|
||||||
@@ -206,7 +210,7 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
# We require a distribution name.
|
# We require a distribution name.
|
||||||
#
|
#
|
||||||
if ( !defined( $CONFIG{ 'dist' } ) )
|
if ( ! defined( $CONFIG{'dist'} ) )
|
||||||
{
|
{
|
||||||
print "The '--dist' argument is mandatory\n";
|
print "The '--dist' argument is mandatory\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -220,9 +224,9 @@ sub checkArguments
|
|||||||
# If there are no scripts then we clearly cannot
|
# If there are no scripts then we clearly cannot
|
||||||
# customise it!
|
# customise it!
|
||||||
#
|
#
|
||||||
my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
|
my $dir = "/usr/lib/xen-tools/" . $CONFIG{'dist'} . ".d";
|
||||||
|
|
||||||
if ( !-d $dir )
|
if ( ! -d $dir )
|
||||||
{
|
{
|
||||||
print <<E_OR;
|
print <<E_OR;
|
||||||
|
|
||||||
@@ -258,16 +262,15 @@ E_OR
|
|||||||
|
|
||||||
sub runDistributionHooks
|
sub runDistributionHooks
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Hook directory.
|
# Hook directory.
|
||||||
#
|
#
|
||||||
my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
|
my $hooks = "/usr/lib/xen-tools/" . $CONFIG{'dist'} . ".d/";
|
||||||
|
|
||||||
#
|
#
|
||||||
# Installation prefix
|
# Installation prefix
|
||||||
#
|
#
|
||||||
my $prefix = $CONFIG{ 'location' };
|
my $prefix = $CONFIG{'location'};
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we're running verbosely then setup the client environment
|
# If we're running verbosely then setup the client environment
|
||||||
@@ -276,9 +279,9 @@ sub runDistributionHooks
|
|||||||
# This is useful in case this script is called outwith the usual
|
# This is useful in case this script is called outwith the usual
|
||||||
# xen-create-image framework.
|
# xen-create-image framework.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'verbose' } )
|
if ( $CONFIG{'verbose'} )
|
||||||
{
|
{
|
||||||
$ENV{ 'verbose' } = 1;
|
$ENV{'verbose'} = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -287,7 +290,6 @@ sub runDistributionHooks
|
|||||||
#
|
#
|
||||||
foreach my $file ( sort( glob( $hooks . "*" ) ) )
|
foreach my $file ( sort( glob( $hooks . "*" ) ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
# skip files that end with .dpkg-new, .dpkg-old or '~'
|
# skip files that end with .dpkg-new, .dpkg-old or '~'
|
||||||
next if ( $file =~ /\.dpkg-(new|old)/ );
|
next if ( $file =~ /\.dpkg-(new|old)/ );
|
||||||
next if ( $file =~ /~$/ );
|
next if ( $file =~ /~$/ );
|
||||||
@@ -297,7 +299,6 @@ sub runDistributionHooks
|
|||||||
#
|
#
|
||||||
if ( ( -x $file ) && ( -f $file ) )
|
if ( ( -x $file ) && ( -f $file ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Just display the name - no need to see the full path.
|
# Just display the name - no need to see the full path.
|
||||||
#
|
#
|
||||||
@@ -316,26 +317,18 @@ sub runDistributionHooks
|
|||||||
# Run the command. This has different prolog and epilog
|
# Run the command. This has different prolog and epilog
|
||||||
# depending on whether we're running verbosely or not.
|
# depending on whether we're running verbosely or not.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'verbose' } )
|
if ( $CONFIG{'verbose'} )
|
||||||
{
|
{
|
||||||
print "Running hook $name ['$cmd']\n";
|
print "Running hook $name ['$cmd']\n";
|
||||||
print "--\n";
|
print "--\n";
|
||||||
my $rc = system($cmd);
|
system( $cmd );
|
||||||
if ($rc != 0) {
|
|
||||||
print "hook $name failed: $?\n";
|
|
||||||
exit 1;
|
|
||||||
}
|
|
||||||
print "--\n";
|
print "--\n";
|
||||||
print "Done\n\n";
|
print "Done\n\n";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Running hook $name\n";
|
print "Running hook $name\n";
|
||||||
my $rc = system($cmd);
|
system( $cmd );
|
||||||
if ($rc != 0) {
|
|
||||||
print "hook $name failed: $?\n";
|
|
||||||
exit 1;
|
|
||||||
}
|
|
||||||
print "hook $name: done.\n";
|
print "hook $name: done.\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,183 +0,0 @@
|
|||||||
#!/usr/bin/perl -w
|
|
||||||
|
|
||||||
=head1 NAME
|
|
||||||
|
|
||||||
xen-guess-debian-mirror - Tries to guess the most suitable mirror and
|
|
||||||
suite for DomUs on Debian and Ubuntu Dom0s.
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
=head1 SYNOPSIS
|
|
||||||
|
|
||||||
xen-guess-debian-mirror [-s] [-m]
|
|
||||||
|
|
||||||
-s show suite
|
|
||||||
-m show mirror
|
|
||||||
|
|
||||||
Shows both if no parameter is given.
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
=head1 DESCRIPTION
|
|
||||||
|
|
||||||
xen-guess-debian-mirror tries to find the mirror and suite the Xen
|
|
||||||
Dom0 is currently using and returns them in a way suitable for
|
|
||||||
xen-create-image(1) or the backticks feature in xen-tools.conf.
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
=head1 AUTHOR
|
|
||||||
|
|
||||||
Axel Beckert <abe@deuxchevaux.org>, http://noone.org/abe/
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
=head1 LICENSE
|
|
||||||
|
|
||||||
Copyright (C) 2010 by Steve Kemp. All rights reserved.
|
|
||||||
|
|
||||||
This module is free software; you can redistribute it and/or modify it
|
|
||||||
under the same terms as Perl itself. The LICENSE file contains the
|
|
||||||
full text of the license.
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
###
|
|
||||||
### Configuration
|
|
||||||
###
|
|
||||||
|
|
||||||
# Fallback to Debian or Ubuntu in case we can't find anything
|
|
||||||
my $fallback = 'Debian';
|
|
||||||
|
|
||||||
# Which mirrors to use if everything else fails
|
|
||||||
my %fallback_mirror = ( Debian => 'http://ftp.debian.org/debian/',
|
|
||||||
Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );
|
|
||||||
|
|
||||||
# Which suite to use if everything else fails. For Debian "stable"
|
|
||||||
# should be the best choice independent of the time. Ubuntu does not
|
|
||||||
# have aliases like stable or testing, so we take the nearest LTS
|
|
||||||
# release which is 10.04 at the time of writing.
|
|
||||||
my %fallback_suite = ( Debian => 'stable',
|
|
||||||
Ubuntu => 'lucid' );
|
|
||||||
|
|
||||||
# Where to look for the sources.list to parse
|
|
||||||
my $sources_list_file = '/etc/apt/sources.list';
|
|
||||||
|
|
||||||
use File::Slurp;
|
|
||||||
use Getopt::Long;
|
|
||||||
use Pod::Usage;
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Release number.
|
|
||||||
#
|
|
||||||
my $RELEASE = '4.2rc1';
|
|
||||||
|
|
||||||
# Init
|
|
||||||
my $mirror = '';
|
|
||||||
my $suite = '';
|
|
||||||
my $found = 0;
|
|
||||||
|
|
||||||
# Parsing command line options
|
|
||||||
my $want_mirror = 0;
|
|
||||||
my $want_suite = 0;
|
|
||||||
my $want_version = 0;
|
|
||||||
my $want_help = 0;
|
|
||||||
my $want_usage = 0;
|
|
||||||
|
|
||||||
my $result = GetOptions ('mirror' => \$want_mirror,
|
|
||||||
'suite' => \$want_suite,
|
|
||||||
'version' => \$want_version,
|
|
||||||
'usage' => \$want_usage,
|
|
||||||
'help' => \$want_help);
|
|
||||||
|
|
||||||
if ($want_help) {
|
|
||||||
print "Usage: $0 [-m] [-s]\n";
|
|
||||||
exit 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($want_usage) {
|
|
||||||
pod2usage(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-r $sources_list_file) {
|
|
||||||
# sources.list exists, so it's something debianoid.
|
|
||||||
|
|
||||||
# read sources.list and split it into lines
|
|
||||||
my @sources_list = read_file($sources_list_file);
|
|
||||||
|
|
||||||
# Find the first line which is a Debian or Ubuntu mirror but not
|
|
||||||
# an updates, backports, volatile or security mirror.
|
|
||||||
foreach my $sources_list_entry (@sources_list) {
|
|
||||||
# Normalize line
|
|
||||||
chomp($sources_list_entry);
|
|
||||||
$sources_list_entry =~ s/^\s*(.*?)\s*$/$1/;
|
|
||||||
|
|
||||||
# Skip definite non-entries
|
|
||||||
next if $sources_list_entry =~ /^\s*($|#)/;
|
|
||||||
|
|
||||||
# Split up into fields
|
|
||||||
my @source_components = split(/\s+/, $sources_list_entry);
|
|
||||||
|
|
||||||
# Minimum number of components is 4
|
|
||||||
next if $#source_components < 3;
|
|
||||||
|
|
||||||
# Don't use deb-src entries.
|
|
||||||
next if $source_components[0] eq 'deb-src';
|
|
||||||
|
|
||||||
# Skip updates, backports, volatile or security mirror.
|
|
||||||
next if $source_components[2] !~ /^[a-z]+$/;
|
|
||||||
|
|
||||||
if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
|
|
||||||
# Seems a typical mirror. Let's use that one
|
|
||||||
|
|
||||||
$mirror = $source_components[1];
|
|
||||||
$suite = $source_components[2];
|
|
||||||
|
|
||||||
$found = 1;
|
|
||||||
last;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
warn "Couldn't parse $sources_list_file of the Dom0.\n" unless $found;
|
|
||||||
}
|
|
||||||
|
|
||||||
my $lsb_release = `which lsb_release`;
|
|
||||||
chomp($lsb_release);
|
|
||||||
|
|
||||||
if (!$found and $lsb_release and -x $lsb_release) {
|
|
||||||
my $vendor = `$lsb_release -s -i`;
|
|
||||||
|
|
||||||
if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') {
|
|
||||||
$suite = `$lsb_release -s -c`;
|
|
||||||
chomp($suite);
|
|
||||||
|
|
||||||
unless ($suite) {
|
|
||||||
$suite = $fallback_suite{$vendor};
|
|
||||||
warn "Dom0 seems to be $vendor, but couldn't determine suite. Falling back to $suite.\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
$mirror = $fallback_mirror{$vendor};
|
|
||||||
|
|
||||||
$found = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($found) {
|
|
||||||
unless ($want_help || $want_version || $want_suite || $want_mirror) {
|
|
||||||
print "$mirror $suite\n";
|
|
||||||
} else {
|
|
||||||
if ($want_mirror) {
|
|
||||||
print "$mirror";
|
|
||||||
}
|
|
||||||
if ($want_suite) {
|
|
||||||
print "$suite";
|
|
||||||
}
|
|
||||||
print "\n";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$suite = $fallback_suite{$fallback};
|
|
||||||
$mirror = $fallback_mirror{$fallback};
|
|
||||||
}
|
|
||||||
@@ -29,11 +29,8 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
|
|||||||
--mirror The mirror to use when installing with 'debootstrap'.
|
--mirror The mirror to use when installing with 'debootstrap'.
|
||||||
|
|
||||||
Installation Options:
|
Installation Options:
|
||||||
--install-method Specify the installation method to use.
|
--install-method Specify the installation method to use.
|
||||||
--install-source Specify the installation source to use.
|
--install-source Specify the installation source to use.
|
||||||
--debootstrap-cmd Specify which debootstrap command to
|
|
||||||
use. Defaults to debootstrap if both, debootstrap
|
|
||||||
and cdebootstrap are installed.
|
|
||||||
|
|
||||||
All other options from xen-create-image will be passed as environmental
|
All other options from xen-create-image will be passed as environmental
|
||||||
variables.
|
variables.
|
||||||
@@ -91,7 +88,7 @@ Untar a .tar file into the new installation location. This tarfile is assumed t
|
|||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
Copyright (c) 2005-2009 by Steve Kemp. All rights reserved.
|
Copyright (c) 2005-2007 by Steve Kemp. All rights reserved.
|
||||||
|
|
||||||
This module is free software;
|
This module is free software;
|
||||||
you can redistribute it and/or modify it under
|
you can redistribute it and/or modify it under
|
||||||
@@ -116,7 +113,7 @@ my %CONFIG;
|
|||||||
#
|
#
|
||||||
# Release number.
|
# Release number.
|
||||||
#
|
#
|
||||||
my $RELEASE = '4.2rc1';
|
my $RELEASE = '3.9';
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -130,31 +127,50 @@ my $RELEASE = '4.2rc1';
|
|||||||
# needDirectory Defined if we need an install-source directory specified.
|
# needDirectory Defined if we need an install-source directory specified.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
my %dispatch = (
|
my %dispatch =
|
||||||
"copy" => { sub => \&do_copy,
|
(
|
||||||
needBinary => "/bin/cp",
|
"copy" =>
|
||||||
needDirectory => 1,
|
{
|
||||||
},
|
sub => \&do_copy,
|
||||||
"debootstrap" => { sub => \&do_debootstrap,
|
needBinary => "/bin/cp",
|
||||||
needBinary => "/usr/sbin/debootstrap",
|
needDirectory => 1,
|
||||||
},
|
},
|
||||||
"rinse" => { sub => \&do_rinse,
|
"debootstrap" =>
|
||||||
needBinary => "/usr/sbin/rinse",
|
{
|
||||||
},
|
sub => \&do_debootstrap,
|
||||||
"rpmstrap" => { sub => \&do_rpmstrap,
|
needBinary => "/usr/sbin/debootstrap",
|
||||||
needBinary => "/usr/bin/rpmstrap",
|
},
|
||||||
},
|
"image-server" =>
|
||||||
"tar" => { sub => \&do_tar,
|
{
|
||||||
needBinary => "/bin/tar",
|
sub => \&do_image_server,
|
||||||
needFile => 1,
|
needURL => 1,
|
||||||
} );
|
},
|
||||||
|
"rinse" =>
|
||||||
|
{
|
||||||
|
sub => \&do_rinse,
|
||||||
|
needBinary => "/usr/bin/rinse",
|
||||||
|
},
|
||||||
|
"rpmstrap" =>
|
||||||
|
{
|
||||||
|
sub => \&do_rpmstrap,
|
||||||
|
needBinary => "/usr/bin/rpmstrap",
|
||||||
|
},
|
||||||
|
"tar" =>
|
||||||
|
{
|
||||||
|
sub => \&do_tar,
|
||||||
|
needBinary => "/bin/tar",
|
||||||
|
needFile => 1,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Read the global configuration file.
|
# Read the global configuration file.
|
||||||
#
|
#
|
||||||
readConfigurationFile("/etc/xen-tools/xen-tools.conf");
|
readConfigurationFile( "/etc/xen-tools/xen-tools.conf" );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -166,9 +182,9 @@ parseCommandLineArguments();
|
|||||||
#
|
#
|
||||||
# If we received a configuration file then read it.
|
# If we received a configuration file then read it.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'config' } )
|
if ( $CONFIG{'config'} )
|
||||||
{
|
{
|
||||||
my $path = $CONFIG{ 'config' };
|
my $path = $CONFIG{'config'};
|
||||||
|
|
||||||
# If not fully-qualified then read from /etc/xen-tools.
|
# If not fully-qualified then read from /etc/xen-tools.
|
||||||
if ( $path !~ /^[\/]/ )
|
if ( $path !~ /^[\/]/ )
|
||||||
@@ -177,7 +193,7 @@ if ( $CONFIG{ 'config' } )
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Read the file, if it exists.
|
# Read the file, if it exists.
|
||||||
readConfigurationFile($path) if ( -e $path );
|
readConfigurationFile( $path ) if ( -e $path );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -190,65 +206,59 @@ checkArguments();
|
|||||||
#
|
#
|
||||||
# Now lookup our installation type and dispatch control to it.
|
# Now lookup our installation type and dispatch control to it.
|
||||||
#
|
#
|
||||||
if ( defined( $CONFIG{ 'install-method' } ) &&
|
if ( defined( $CONFIG{'install-method'} ) &&
|
||||||
length( $CONFIG{ 'install-method' } ) )
|
length( $CONFIG{'install-method'} ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Get the entry from the dispatch table.
|
# Get the entry from the dispatch table.
|
||||||
#
|
#
|
||||||
my $installer = $dispatch{ lc( $CONFIG{ 'install-method' } ) };
|
my $installer = $dispatch{ lc($CONFIG{'install-method'}) };
|
||||||
|
|
||||||
if ( defined($installer) )
|
if ( defined( $installer ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we found it.
|
# If we found it.
|
||||||
#
|
#
|
||||||
|
|
||||||
# Do we need to test for a binary.
|
# Do we need to test for a binary.
|
||||||
if ( ( $installer->{ 'needBinary' } ) &&
|
if ( ( $installer->{'needBinary'} ) &&
|
||||||
( !-x $installer->{ 'needBinary' } ) )
|
( ! -x $installer->{'needBinary'} ) )
|
||||||
{
|
{
|
||||||
print
|
print "The following required binary for the installation was not found\n";
|
||||||
"The following required binary for the installation was not found\n";
|
print "\t" . $installer->{'needBinary'} . "\n";
|
||||||
print "\t" . $installer->{ 'needBinary' } . "\n";
|
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Do we need a directory specified as the installation source?
|
# Do we need a directory specified as the installation source?
|
||||||
if ( ( $installer->{ 'needDirectory' } ) &&
|
if ( ( $installer->{'needDirectory'} ) &&
|
||||||
( !$CONFIG{ 'install-source' } || !-d $CONFIG{ 'install-source' } )
|
( ! $CONFIG{'install-source'} || ! -d $CONFIG{'install-source'} ) )
|
||||||
)
|
|
||||||
{
|
{
|
||||||
print "Please specify the source directory with --install-source\n";
|
print "Please specify the source directory with --install-source\n";
|
||||||
if ( $CONFIG{ 'install-source' } )
|
if ( $CONFIG{'install-source'} )
|
||||||
{
|
{
|
||||||
print
|
print "The specified directory $CONFIG{'install-source'} does not exist.\n";
|
||||||
"The specified directory $CONFIG{'install-source'} does not exist.\n";
|
|
||||||
}
|
}
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Do we need a file specified as the installation source?
|
# Do we need a file specified as the installation source?
|
||||||
if ( ( $installer->{ 'needFile' } ) &&
|
if ( ( $installer->{'needFile'} ) &&
|
||||||
( !$CONFIG{ 'install-source' } || !-e $CONFIG{ 'install-source' } )
|
( ! $CONFIG{'install-source'} || ! -e $CONFIG{'install-source'} ) )
|
||||||
)
|
|
||||||
{
|
{
|
||||||
print "Please specify the source file with --install-source\n";
|
print "Please specify the source file with --install-source\n";
|
||||||
|
|
||||||
if ( $CONFIG{ 'install-source' } )
|
if ( $CONFIG{'install-source'} )
|
||||||
{
|
{
|
||||||
print
|
print "The specified file $CONFIG{'install-source'} does not exist.\n";
|
||||||
"The specified file $CONFIG{'install-source'} does not exist.\n";
|
|
||||||
}
|
}
|
||||||
exit 1;
|
exit 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Do we need an URL specified as the installation source?
|
# Do we need an URL specified as the installation source?
|
||||||
if ( ( $installer->{ 'needURL' } ) &&
|
if ( ( $installer->{'needURL'} ) &&
|
||||||
( !$CONFIG{ 'install-source' } ||
|
( ! $CONFIG{'install-source'} ||
|
||||||
( $CONFIG{ 'install-source' } !~ /^http/i ) ) )
|
( $CONFIG{'install-source'} !~ /^http/i ) ) )
|
||||||
{
|
{
|
||||||
print "Please specify the image server URL with --install-source\n";
|
print "Please specify the image server URL with --install-source\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -259,16 +269,16 @@ if ( defined( $CONFIG{ 'install-method' } ) &&
|
|||||||
#
|
#
|
||||||
# Now we can call the appropriate handler.
|
# Now we can call the appropriate handler.
|
||||||
#
|
#
|
||||||
$installer->{ 'sub' }->();
|
$installer->{'sub'}->();
|
||||||
|
|
||||||
#
|
#
|
||||||
# Did the operation succeed?
|
# Did the operation succeed?
|
||||||
#
|
#
|
||||||
# Test that we have some "standard" files present.
|
# Test that we have some "standard" files present.
|
||||||
#
|
#
|
||||||
foreach my $file (qw( /bin/ls /bin/cp ))
|
foreach my $file ( qw( /bin/ls /bin/cp ) )
|
||||||
{
|
{
|
||||||
if ( !-x $CONFIG{ 'location' } . $file )
|
if ( ! -x $CONFIG{'location'} . $file )
|
||||||
{
|
{
|
||||||
print "The installation of the new system has failed.\n";
|
print "The installation of the new system has failed.\n";
|
||||||
print "\n";
|
print "\n";
|
||||||
@@ -296,6 +306,10 @@ else
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Read the specified configuration file, and update our global configuration
|
Read the specified configuration file, and update our global configuration
|
||||||
@@ -307,20 +321,20 @@ else
|
|||||||
|
|
||||||
sub readConfigurationFile
|
sub readConfigurationFile
|
||||||
{
|
{
|
||||||
my ($file) = (@_);
|
my ($file) = ( @_ );
|
||||||
|
|
||||||
# Don't read the file if it doesn't exist.
|
# Don't read the file if it doesn't exist.
|
||||||
return if ( !-e $file );
|
return if ( ! -e $file );
|
||||||
|
|
||||||
|
|
||||||
my $line = "";
|
my $line = "";
|
||||||
|
|
||||||
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
open( FILE, "<", $file ) or die "Cannot read file '$file' - $!";
|
||||||
|
|
||||||
while ( defined( $line = <FILE> ) )
|
while (defined($line = <FILE>) )
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ( $line =~ s/\\$// )
|
if ($line =~ s/\\$//)
|
||||||
{
|
{
|
||||||
$line .= <FILE>;
|
$line .= <FILE>;
|
||||||
redo unless eof(FILE);
|
redo unless eof(FILE);
|
||||||
@@ -330,7 +344,7 @@ sub readConfigurationFile
|
|||||||
next if ( $line =~ /^([ \t]*)\#/ );
|
next if ( $line =~ /^([ \t]*)\#/ );
|
||||||
|
|
||||||
# Skip blank lines
|
# Skip blank lines
|
||||||
next if ( length($line) < 1 );
|
next if ( length( $line ) < 1 );
|
||||||
|
|
||||||
# Strip trailing comments.
|
# Strip trailing comments.
|
||||||
if ( $line =~ /(.*)\#(.*)/ )
|
if ( $line =~ /(.*)\#(.*)/ )
|
||||||
@@ -353,7 +367,6 @@ sub readConfigurationFile
|
|||||||
# command expansion?
|
# command expansion?
|
||||||
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
if ( $val =~ /(.*)`([^`]+)`(.*)/ )
|
||||||
{
|
{
|
||||||
|
|
||||||
# store
|
# store
|
||||||
my $pre = $1;
|
my $pre = $1;
|
||||||
my $cmd = $2;
|
my $cmd = $2;
|
||||||
@@ -361,7 +374,7 @@ sub readConfigurationFile
|
|||||||
|
|
||||||
# get output
|
# get output
|
||||||
my $output = `$cmd`;
|
my $output = `$cmd`;
|
||||||
chomp($output);
|
chomp( $output );
|
||||||
|
|
||||||
# build up replacement.
|
# build up replacement.
|
||||||
$val = $pre . $output . $post;
|
$val = $pre . $output . $post;
|
||||||
@@ -372,7 +385,7 @@ sub readConfigurationFile
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close(FILE);
|
close( FILE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -395,37 +408,35 @@ sub parseCommandLineArguments
|
|||||||
# Parse options.
|
# Parse options.
|
||||||
#
|
#
|
||||||
GetOptions(
|
GetOptions(
|
||||||
|
# Mandatory
|
||||||
|
"location=s", \$CONFIG{'location'},
|
||||||
|
"dist=s", \$CONFIG{'dist'},
|
||||||
|
"hostname=s", \$CONFIG{'hostname'},
|
||||||
|
|
||||||
# Mandatory
|
# Installation method
|
||||||
"location=s", \$CONFIG{ 'location' },
|
"install-method=s", \$CONFIG{'install-method'},
|
||||||
"dist=s", \$CONFIG{ 'dist' },
|
"install-source=s", \$CONFIG{'install-source'},
|
||||||
"hostname=s", \$CONFIG{ 'hostname' },
|
|
||||||
|
|
||||||
# Installation method
|
# Misc
|
||||||
"install-method=s", \$CONFIG{ 'install-method' },
|
"arch=s", \$CONFIG{'arch'},
|
||||||
"install-source=s", \$CONFIG{ 'install-source' },
|
"cache=s", \$CONFIG{'cache'},
|
||||||
"debootstrap-cmd=s", \$CONFIG{ 'debootstrap-cmd' },
|
"config=s", \$CONFIG{'config'},
|
||||||
|
"mirror=s", \$CONFIG{'mirror'},
|
||||||
|
|
||||||
# Misc
|
# Help.
|
||||||
"arch=s", \$CONFIG{ 'arch' },
|
"verbose", \$CONFIG{'verbose'},
|
||||||
"cache=s", \$CONFIG{ 'cache' },
|
"help", \$HELP,
|
||||||
"config=s", \$CONFIG{ 'config' },
|
"manual", \$MANUAL,
|
||||||
"mirror=s", \$CONFIG{ 'mirror' },
|
"version", \$VERSION
|
||||||
|
);
|
||||||
# Help.
|
|
||||||
"verbose", \$CONFIG{ 'verbose' },
|
|
||||||
"help", \$HELP,
|
|
||||||
"manual", \$MANUAL,
|
|
||||||
"version", \$VERSION
|
|
||||||
);
|
|
||||||
|
|
||||||
pod2usage(1) if $HELP;
|
pod2usage(1) if $HELP;
|
||||||
pod2usage( -verbose => 2 ) if $MANUAL;
|
pod2usage(-verbose => 2 ) if $MANUAL;
|
||||||
|
|
||||||
|
|
||||||
if ($VERSION)
|
if ( $VERSION )
|
||||||
{
|
{
|
||||||
my $REVISION = '$Revision: 1.65 $';
|
my $REVISION = '$Revision: 1.65 $';
|
||||||
if ( $REVISION =~ /1.([0-9.]+) / )
|
if ( $REVISION =~ /1.([0-9.]+) / )
|
||||||
{
|
{
|
||||||
$REVISION = $1;
|
$REVISION = $1;
|
||||||
@@ -448,11 +459,10 @@ sub parseCommandLineArguments
|
|||||||
|
|
||||||
sub checkArguments
|
sub checkArguments
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# We require a location.
|
# We require a location.
|
||||||
#
|
#
|
||||||
if ( !defined( $CONFIG{ 'location' } ) )
|
if ( ! defined( $CONFIG{'location'} ) )
|
||||||
{
|
{
|
||||||
print "The '--location' argument is mandatory\n";
|
print "The '--location' argument is mandatory\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -462,7 +472,7 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
# Test that the location we've been given exists
|
# Test that the location we've been given exists
|
||||||
#
|
#
|
||||||
if ( !-d $CONFIG{ 'location' } )
|
if ( ! -d $CONFIG{'location'} )
|
||||||
{
|
{
|
||||||
print "The installation directory we've been given doesn't exist\n";
|
print "The installation directory we've been given doesn't exist\n";
|
||||||
print "We tried to use : $CONFIG{'location'}\n";
|
print "We tried to use : $CONFIG{'location'}\n";
|
||||||
@@ -473,7 +483,7 @@ sub checkArguments
|
|||||||
#
|
#
|
||||||
# We require a distribution name.
|
# We require a distribution name.
|
||||||
#
|
#
|
||||||
if ( !defined( $CONFIG{ 'dist' } ) )
|
if ( ! defined( $CONFIG{'dist'} ) )
|
||||||
{
|
{
|
||||||
print "The '--dist' argument is mandatory\n";
|
print "The '--dist' argument is mandatory\n";
|
||||||
exit 1;
|
exit 1;
|
||||||
@@ -487,18 +497,18 @@ sub checkArguments
|
|||||||
# If there are no scripts then we clearly cannot
|
# If there are no scripts then we clearly cannot
|
||||||
# customise it!
|
# customise it!
|
||||||
#
|
#
|
||||||
my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
|
my $dir = "/usr/lib/xen-tools/" . $CONFIG{'dist'} . ".d";
|
||||||
|
|
||||||
if ( !-d $dir )
|
if ( ! -d $dir )
|
||||||
{
|
{
|
||||||
print <<E_OR;
|
print <<E_OR;
|
||||||
|
|
||||||
We are trying to configure an installation of $CONFIG{'dist'} in
|
We're trying to configure an installation of $CONFIG{'dist'} in
|
||||||
$CONFIG{'location'} - but there is no hook directory for us to use.
|
$CONFIG{'location'} - but there is no hook directory for us to use.
|
||||||
|
|
||||||
This means we would not know how to configure this installation.
|
This means we won't know how to configure this installation.
|
||||||
|
|
||||||
We would expect the hook directory to be $dir.
|
We'd expect the hook directory to be : $dir
|
||||||
|
|
||||||
Aborting.
|
Aborting.
|
||||||
E_OR
|
E_OR
|
||||||
@@ -510,12 +520,11 @@ E_OR
|
|||||||
# Test that we received a valid installation type.
|
# Test that we received a valid installation type.
|
||||||
#
|
#
|
||||||
my $valid = 0;
|
my $valid = 0;
|
||||||
if ( defined( $CONFIG{ 'install-method' } ) )
|
if ( defined( $CONFIG{'install-method'} ) )
|
||||||
{
|
{
|
||||||
foreach my $recognised ( keys %dispatch )
|
foreach my $recognised ( keys %dispatch )
|
||||||
{
|
{
|
||||||
$valid = 1
|
$valid = 1 if ( lc($CONFIG{'install-method'}) eq lc($recognised) );
|
||||||
if ( lc( $CONFIG{ 'install-method' } ) eq lc($recognised) );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -543,6 +552,7 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
A utility method to run a system command. We will capture the return
|
A utility method to run a system command. We will capture the return
|
||||||
@@ -556,12 +566,12 @@ EOF
|
|||||||
|
|
||||||
sub runCommand
|
sub runCommand
|
||||||
{
|
{
|
||||||
my ($cmd) = (@_);
|
my ( $cmd ) = (@_ );
|
||||||
|
|
||||||
#
|
#
|
||||||
# Command start.
|
# Command start.
|
||||||
#
|
#
|
||||||
$CONFIG{ 'verbose' } && print "Executing : $cmd\n";
|
$CONFIG{'verbose'} && print "Executing : $cmd\n";
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copy stderr to stdout, so we can see it, and make sure we log it.
|
# Copy stderr to stdout, so we can see it, and make sure we log it.
|
||||||
@@ -577,19 +587,20 @@ sub runCommand
|
|||||||
{
|
{
|
||||||
print "Running command '$cmd' failed.\n";
|
print "Running command '$cmd' failed.\n";
|
||||||
print "Aborting\n";
|
print "Aborting\n";
|
||||||
exit 127;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Command finished.
|
# Command finished.
|
||||||
#
|
#
|
||||||
$CONFIG{ 'verbose' } && print "Finished : $cmd\n";
|
$CONFIG{'verbose'} && print "Finished : $cmd\n";
|
||||||
|
|
||||||
return ($output);
|
return( $output );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
This function will copy all the .deb files from one directory
|
This function will copy all the .deb files from one directory
|
||||||
@@ -602,7 +613,7 @@ sub runCommand
|
|||||||
|
|
||||||
sub copyDebFiles
|
sub copyDebFiles
|
||||||
{
|
{
|
||||||
my ( $source, $dest ) = (@_);
|
my ( $source, $dest ) = ( @_ );
|
||||||
|
|
||||||
print "Copying files from $source -> $dest\n";
|
print "Copying files from $source -> $dest\n";
|
||||||
|
|
||||||
@@ -620,7 +631,7 @@ sub copyDebFiles
|
|||||||
#
|
#
|
||||||
# Only copy if the file doesn't already exist.
|
# Only copy if the file doesn't already exist.
|
||||||
#
|
#
|
||||||
if ( !( -e $dest . "/" . $name ) )
|
if ( ! ( -e $dest . "/" . $name ) )
|
||||||
{
|
{
|
||||||
File::Copy::cp( $file, $dest );
|
File::Copy::cp( $file, $dest );
|
||||||
}
|
}
|
||||||
@@ -631,6 +642,8 @@ sub copyDebFiles
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
###
|
###
|
||||||
#
|
#
|
||||||
# Installation functions follow.
|
# Installation functions follow.
|
||||||
@@ -639,6 +652,7 @@ sub copyDebFiles
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Install a new image of a distribution using `cp`.
|
Install a new image of a distribution using `cp`.
|
||||||
@@ -649,15 +663,14 @@ sub copyDebFiles
|
|||||||
|
|
||||||
sub do_copy
|
sub do_copy
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Find the copy command to run from the configuration file.
|
# Find the copy command to run from the configuration file.
|
||||||
#
|
#
|
||||||
my $cmd = $CONFIG{ 'copy-cmd' };
|
my $cmd = $CONFIG{'copy-cmd'} ;
|
||||||
if ( !defined($cmd) )
|
if ( !defined( $cmd ) )
|
||||||
{
|
{
|
||||||
print "Falling back to default copy command\n";
|
print "Falling back to default copy command\n";
|
||||||
$cmd = '/bin/cp -a $src/* $dest'; # Note: single quotes.
|
$cmd = '/bin/cp -a $src/* $dest'; # Note: single quotes.
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -669,11 +682,12 @@ sub do_copy
|
|||||||
#
|
#
|
||||||
# Run the copy command.
|
# Run the copy command.
|
||||||
#
|
#
|
||||||
runCommand($cmd);
|
runCommand( $cmd );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Install a new image of Debian using 'debootstrap'.
|
Install a new image of Debian using 'debootstrap'.
|
||||||
@@ -684,23 +698,15 @@ sub do_copy
|
|||||||
|
|
||||||
sub do_debootstrap
|
sub do_debootstrap
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# The command is a little configurable - mostly to allow you
|
# The command is a little configurable - mostly to allow you
|
||||||
# to use cdebootstrap.
|
# to use cdebootstrap.
|
||||||
#
|
#
|
||||||
my $cmd = $CONFIG{ 'debootstrap-cmd' };
|
my $cmd = $CONFIG{'debootstrap-cmd'} ;
|
||||||
if ( !$cmd )
|
if ( !defined( $cmd ) )
|
||||||
{
|
{
|
||||||
if (-x '/usr/sbin/debootstrap') {
|
print "Falling back to default debootstrap command\n";
|
||||||
$cmd = '/usr/sbin/debootstrap';
|
$cmd = '/usr/sbin/debootstrap';
|
||||||
} elsif (-x '/usr/sbin/cdebootstrap') {
|
|
||||||
$cmd = '/usr/sbin/cdebootstrap';
|
|
||||||
} else {
|
|
||||||
print STDERR "Found neither debootstrap nor cdebootstrap and no --debootstrap-cmd given\n";
|
|
||||||
exit 1;
|
|
||||||
}
|
|
||||||
print "Using $cmd as debootstrap command\n";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -708,20 +714,19 @@ sub do_debootstrap
|
|||||||
# Cache from host -> new installation if we've got caching
|
# Cache from host -> new installation if we've got caching
|
||||||
# enabled.
|
# enabled.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'cache' } eq "yes" )
|
if ( $CONFIG{'cache'} eq "yes" )
|
||||||
{
|
{
|
||||||
print "\nCopying files from host to image.\n";
|
print "\nCopying files from host to image.\n";
|
||||||
runCommand("mkdir -p $CONFIG{'location'}/var/cache/apt/archives");
|
runCommand( "mkdir -p $CONFIG{'location'}/var/cache/apt/archives" );
|
||||||
copyDebFiles( "/var/cache/apt/archives",
|
copyDebFiles( "/var/cache/apt/archives", "$CONFIG{'location'}/var/cache/apt/archives" );
|
||||||
"$CONFIG{'location'}/var/cache/apt/archives" );
|
print( "Done\n" );
|
||||||
print("Done\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Propogate --verbose appropriately.
|
# Propogate --verbose appropriately.
|
||||||
#
|
#
|
||||||
my $EXTRA = '';
|
my $EXTRA = '';
|
||||||
if ( $CONFIG{ 'verbose' } )
|
if ( $CONFIG{'verbose'} )
|
||||||
{
|
{
|
||||||
$EXTRA = ' --verbose';
|
$EXTRA = ' --verbose';
|
||||||
}
|
}
|
||||||
@@ -729,34 +734,33 @@ sub do_debootstrap
|
|||||||
#
|
#
|
||||||
# Propogate the --arch argument
|
# Propogate the --arch argument
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'arch' } )
|
if ( $CONFIG{'arch'} )
|
||||||
{
|
{
|
||||||
$EXTRA .= " --arch $CONFIG{'arch'}";
|
$EXTRA .= " --arch $CONFIG{'arch'}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# This is the command we'll run
|
# This is the command we'll run
|
||||||
#
|
#
|
||||||
my $command =
|
my $command = "$cmd $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $CONFIG{'mirror'}";
|
||||||
"$cmd $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $CONFIG{'mirror'}";
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Run the command.
|
# Run the command.
|
||||||
#
|
#
|
||||||
runCommand($command);
|
runCommand( $command );
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Cache from the new installation -> the host if we've got caching
|
# Cache from the new installation -> the host if we've got caching
|
||||||
# enabled.
|
# enabled.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'cache' } eq "yes" )
|
if ( $CONFIG{'cache'} eq "yes" )
|
||||||
{
|
{
|
||||||
print "\nCopying files from new installation to host.\n";
|
print "\nCopying files from new installation to host.\n";
|
||||||
copyDebFiles( "$CONFIG{'location'}/var/cache/apt/archives",
|
copyDebFiles( "$CONFIG{'location'}/var/cache/apt/archives",
|
||||||
"/var/cache/apt/archives" );
|
"/var/cache/apt/archives" );
|
||||||
print("Done\n");
|
print( "Done\n" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -764,9 +768,162 @@ sub do_debootstrap
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Install a new distribution of GNU/Linux using the rinse tool.
|
Install a system using the image-server.
|
||||||
|
|
||||||
|
Note: NON-Advertised ....
|
||||||
|
|
||||||
|
=end doc
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub do_image_server
|
||||||
|
{
|
||||||
|
#
|
||||||
|
# Load the modules we require.
|
||||||
|
#
|
||||||
|
my $test = 'use LWP::UserAgent; use CGI;';
|
||||||
|
|
||||||
|
#
|
||||||
|
# Test loading the module, if it fails then
|
||||||
|
# we must abort. We don't want to insist the module
|
||||||
|
# is installed since that adds to the dependencies
|
||||||
|
# which users will not require for the typical installation
|
||||||
|
# method(s).
|
||||||
|
#
|
||||||
|
eval( $test );
|
||||||
|
if ( $@ )
|
||||||
|
{
|
||||||
|
die "The module LDP::UserAgent wasn't found...\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# The number of attempts to request the image from our
|
||||||
|
# image server, and the time to sleep between them.
|
||||||
|
#
|
||||||
|
my $attempts = 30;
|
||||||
|
my $sleep = 30;
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Build up the request we're going to send.
|
||||||
|
#
|
||||||
|
my $request = $CONFIG{'install-source'} . "/create.cgi?submit=1";
|
||||||
|
|
||||||
|
#
|
||||||
|
# Some parameters are hard-wired.
|
||||||
|
#
|
||||||
|
$request .= "&arch=amd64";
|
||||||
|
$request .= "&root_device=/dev/sda";
|
||||||
|
$request .= "&ip1=" . $ENV{'ip1'};
|
||||||
|
$request .= "&dist=" . CGI::escapeHTML( $CONFIG{'dist'} );
|
||||||
|
$request .= "&hostname=" . CGI::escapeHTML( $CONFIG{'hostname'} );
|
||||||
|
|
||||||
|
#
|
||||||
|
# We only care about some keys
|
||||||
|
#
|
||||||
|
foreach my $k ( qw/ dhcp broadcast gateway netmask / )
|
||||||
|
{
|
||||||
|
# Skip values which aren't defined.
|
||||||
|
next unless defined $ENV{$k};
|
||||||
|
|
||||||
|
# CGI encode.
|
||||||
|
my $val = CGI::escapeHTML( $ENV{$k} );
|
||||||
|
|
||||||
|
# Add on to the request
|
||||||
|
$request .= "&$k=$val";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Create a new user agent.
|
||||||
|
#
|
||||||
|
my $ua = LWP::UserAgent->new;
|
||||||
|
$ua->timeout(10);
|
||||||
|
$ua->env_proxy;
|
||||||
|
|
||||||
|
#
|
||||||
|
# Do the creation step
|
||||||
|
#
|
||||||
|
my $response = $ua->get( $request );
|
||||||
|
if ($response->is_success)
|
||||||
|
{
|
||||||
|
my $content = $response->content;
|
||||||
|
|
||||||
|
if ( $content =~ /fetch.cgi\?session=([^"]+)"/ )
|
||||||
|
{
|
||||||
|
my $session = $1;
|
||||||
|
my $new = $CONFIG{'install-source'};
|
||||||
|
$new .= "/fetch.cgi?session=$session";
|
||||||
|
my $attempt = 1;
|
||||||
|
|
||||||
|
# Make sure we don't wait indefinitely.
|
||||||
|
while( $attempt < $attempts )
|
||||||
|
{
|
||||||
|
$CONFIG{'verbose'} && print "Request: [$attempt/$attempts]\n";
|
||||||
|
|
||||||
|
#
|
||||||
|
# Make a request to see if our tar file is ready yet.
|
||||||
|
#
|
||||||
|
$response = $ua->head( $new );
|
||||||
|
if ( $response->is_success )
|
||||||
|
{
|
||||||
|
|
||||||
|
#
|
||||||
|
# Get the headers
|
||||||
|
#
|
||||||
|
my $header = $response->headers();
|
||||||
|
my $type = $header->{'content-type'};
|
||||||
|
|
||||||
|
#
|
||||||
|
# OK our file is correct.
|
||||||
|
#
|
||||||
|
if ( $type =~ /tar/ )
|
||||||
|
{
|
||||||
|
#
|
||||||
|
# Download it to the installation root.
|
||||||
|
#
|
||||||
|
$ua->get( $new,
|
||||||
|
":content_file" => $CONFIG{'location'} . "/$session.tar"
|
||||||
|
);
|
||||||
|
|
||||||
|
#
|
||||||
|
# If it worked .. then untar, remove, and return.
|
||||||
|
#
|
||||||
|
system( "cd $CONFIG{'location'} && tar --numeric-owner -xf $session.tar && rm -f $CONFIG{'location'}/$session.tar" );
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sleep( $sleep );
|
||||||
|
$attempt += 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
print ( "ERROR: Timeout waiting for image to be ready." );
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print( "ERROR: Failed to find session. Received this:\n$content\n" );
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print( "ERROR: Submitting the image create request failed:\n" . $response->status_line );
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
=begin doc
|
||||||
|
|
||||||
|
Install a new distribution of GNU/Linux using the rpmstrap tool.
|
||||||
|
|
||||||
=end doc
|
=end doc
|
||||||
|
|
||||||
@@ -774,31 +931,29 @@ sub do_debootstrap
|
|||||||
|
|
||||||
sub do_rinse
|
sub do_rinse
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# The command we're going to run.
|
# The command we're going to run.
|
||||||
#
|
#
|
||||||
my $command =
|
my $command = "rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";
|
||||||
"rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Propogate the --arch argument
|
# Propogate the --arch argument
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'arch' } )
|
if ( $CONFIG{'arch'} )
|
||||||
{
|
{
|
||||||
$command .= " --arch $CONFIG{'arch'}";
|
$command .= " --arch $CONFIG{'arch'}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Propogate the verbosity setting.
|
# Propogate the verbosity setting.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'verbose' } )
|
if ( $CONFIG{'verbose'} )
|
||||||
{
|
{
|
||||||
$command .= " --verbose";
|
$command .= " --verbose";
|
||||||
}
|
}
|
||||||
|
|
||||||
runCommand($command);
|
runCommand( $command );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -817,8 +972,8 @@ sub do_rpmstrap
|
|||||||
#
|
#
|
||||||
# Propogate the verbosity setting.
|
# Propogate the verbosity setting.
|
||||||
#
|
#
|
||||||
my $EXTRA = '';
|
my $EXTRA='';
|
||||||
if ( $CONFIG{ 'verbose' } )
|
if ( $CONFIG{'verbose'} )
|
||||||
{
|
{
|
||||||
$EXTRA .= " --verbose";
|
$EXTRA .= " --verbose";
|
||||||
}
|
}
|
||||||
@@ -826,7 +981,7 @@ sub do_rpmstrap
|
|||||||
#
|
#
|
||||||
# Propogate any arch setting we might have.
|
# Propogate any arch setting we might have.
|
||||||
#
|
#
|
||||||
if ( $CONFIG{ 'arch' } )
|
if ( $CONFIG{'arch'} )
|
||||||
{
|
{
|
||||||
$EXTRA .= " --arch $CONFIG{'arch'}";
|
$EXTRA .= " --arch $CONFIG{'arch'}";
|
||||||
}
|
}
|
||||||
@@ -835,17 +990,18 @@ sub do_rpmstrap
|
|||||||
# Setup mirror if present.
|
# Setup mirror if present.
|
||||||
#
|
#
|
||||||
my $mirror = "";
|
my $mirror = "";
|
||||||
$mirror = $CONFIG{ 'mirror' } if ( $CONFIG{ 'mirror' } );
|
$mirror = $CONFIG{'mirror'} if ( $CONFIG{'mirror'} );
|
||||||
|
|
||||||
#
|
#
|
||||||
# The command we're going to run.
|
# The command we're going to run.
|
||||||
#
|
#
|
||||||
my $command = "rpmstrap $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $mirror";
|
my $command = "rpmstrap $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $mirror";
|
||||||
runCommand($command);
|
runCommand( $command );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=begin doc
|
=begin doc
|
||||||
|
|
||||||
Install a new image of a distribution using `tar`.
|
Install a new image of a distribution using `tar`.
|
||||||
@@ -856,15 +1012,14 @@ sub do_rpmstrap
|
|||||||
|
|
||||||
sub do_tar
|
sub do_tar
|
||||||
{
|
{
|
||||||
|
|
||||||
#
|
#
|
||||||
# Find the tar command to run from the configuration file.
|
# Find the tar command to run from the configuration file.
|
||||||
#
|
#
|
||||||
my $cmd = $CONFIG{ 'tar-cmd' };
|
my $cmd = $CONFIG{'tar-cmd'} ;
|
||||||
if ( !defined($cmd) )
|
if ( !defined( $cmd ) )
|
||||||
{
|
{
|
||||||
print "Falling back to default tar command\n";
|
print "Falling back to default tar command\n";
|
||||||
$cmd = '/bin/tar --numeric-owner -xvf $src'; # Note: single quotes.
|
$cmd = '/bin/tar --numeric-owner -xvf $src'; # Note: single quotes.
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -875,5 +1030,5 @@ sub do_tar
|
|||||||
#
|
#
|
||||||
# Run a command to copy an installed system into the new root.
|
# Run a command to copy an installed system into the new root.
|
||||||
#
|
#
|
||||||
runCommand("cd $CONFIG{'location'} && $cmd");
|
runCommand( "cd $CONFIG{'location'} && $cmd" );
|
||||||
}
|
}
|
||||||
|
|||||||
18
debian/NEWS
vendored
18
debian/NEWS
vendored
@@ -1,18 +0,0 @@
|
|||||||
xen-tools (4.2~rc1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
If the DomU hangs with "Waiting for root file system" despite
|
|
||||||
/dev/xvd* is used as disk device, adding "xen-blkfront" to
|
|
||||||
/etc/initramfs-tools/modules and runing "update-initramfs -u"
|
|
||||||
afterwards may help.
|
|
||||||
|
|
||||||
If the Dom0 is a Debian or Ubuntu, the distribution and suite for
|
|
||||||
DomUs defaults to the distribution and suite the Dom0 is
|
|
||||||
running. Otherwise Debian DomUs get "stable" and Ubuntu "lucid" by
|
|
||||||
default.
|
|
||||||
|
|
||||||
Default Debian/Ubuntu mirror is now determined by looking into
|
|
||||||
/etc/apt/sources.list (if it exists) and taking the first entry with
|
|
||||||
path ending in /debian/ there.
|
|
||||||
|
|
||||||
-- Axel Beckert <abe@debian.org> Sat, 15 May 2010 18:04:14 +0200
|
|
||||||
|
|
||||||
21
debian/README.source
vendored
21
debian/README.source
vendored
@@ -1,21 +0,0 @@
|
|||||||
How to build xen-tools directly from the Git repository?
|
|
||||||
========================================================
|
|
||||||
|
|
||||||
Clone the git repository and change to the directory of your local
|
|
||||||
working copy.
|
|
||||||
|
|
||||||
$ git clone git://gitorious.org/xen-tools/xen-tools.git
|
|
||||||
$ cd xen-tools
|
|
||||||
|
|
||||||
If you just want to build the binary package, run
|
|
||||||
|
|
||||||
$ dpkg-buildpackage -uc -us -b
|
|
||||||
|
|
||||||
If you want to build source and binary packages, e.g. for an upload to
|
|
||||||
Debian or Ubuntu:
|
|
||||||
|
|
||||||
$ make orig-tar-gz
|
|
||||||
$ dpkg-buildpackage
|
|
||||||
|
|
||||||
|
|
||||||
-- Axel Beckert <abe@debian.org>, Mon, 17 May 2010 13:31:31 +0200
|
|
||||||
162
debian/changelog
vendored
162
debian/changelog
vendored
@@ -1,133 +1,3 @@
|
|||||||
xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
|
|
||||||
|
|
||||||
* New maintainer and upstream authors
|
|
||||||
* Reintroduction into Debian Unstable (Closes: #566714)
|
|
||||||
* New upstream release candidate
|
|
||||||
- Needs dependency on libfile-slurp-perl
|
|
||||||
- Supports for more recent versions of Fedora, Ubuntu and Debian
|
|
||||||
(Closes: #499477)
|
|
||||||
- Supports pygrub. (Added "Suggests: xen-utils" to debian/control)
|
|
||||||
- Uses hvc0 and xvda devices by default
|
|
||||||
- Sets umask to 0077 before creating disk images (Closes: #548909)
|
|
||||||
- Makes sure, MAKEDEV is found in either /dev/ or /sbin/
|
|
||||||
(Closes: #502798, #515228)
|
|
||||||
- Changed rinse path to /usr/sbin/. (Closes: #511211)
|
|
||||||
- Doesn't delete configuration file if it already exists when
|
|
||||||
xen-create-image is run. (Closes: #520177)
|
|
||||||
- Doesn't write the FQDN into /etc/hostname (Closes: #492583)
|
|
||||||
- Dereferences pointers before hashing them to generate a MAC
|
|
||||||
address. (Closes: #547265)
|
|
||||||
- Calls pwconv and grpconv inside chroot when installing Fedora
|
|
||||||
(Closes: #499476)
|
|
||||||
- Fixed typo in /usr/lib/xen-tools/*.d/75-fixup-securetty
|
|
||||||
(Closes: #503339)
|
|
||||||
- Makes better decisions about when to enable Debian security updates
|
|
||||||
in the created DomU (LP: #309750)
|
|
||||||
- Installs dhclient for CentOS and Fedora if DHCP networking is
|
|
||||||
requested (LP: #241446)
|
|
||||||
- Fixes some bashisms (Closes: #530226)
|
|
||||||
* [^y] → [!y] (Thanks to Mathieu Parent!)
|
|
||||||
* kill -HUP → kill -s HUP (found by checkbashism)
|
|
||||||
* ${parm/?/pat[/str]} → echo | sed
|
|
||||||
* echo -e → printf
|
|
||||||
* read → read dummy
|
|
||||||
- xt-install-image now exits with return value 127 instead of 0 to
|
|
||||||
indicate errors on running the command given in --install-method.
|
|
||||||
(Closes: #534290)
|
|
||||||
- The debootstrap command now also can be configured on the
|
|
||||||
commandline with --debootstrap-cmd in xen-create-image and
|
|
||||||
xt-install-image (Enhances fix for #436480 which added the
|
|
||||||
debootstrap-cmd config file option)
|
|
||||||
- Checks for debootstrap and cdebootstrap, uses debootstrap if both
|
|
||||||
are installed (Changed "Depends: debootstrap" to "Depends:
|
|
||||||
debootstrap | cdebootstrap" in debian/control)
|
|
||||||
- Introduces the --domaindir option as alternative to --dir which
|
|
||||||
always appends "/domains/" to the path. (Closes: #477238)
|
|
||||||
* Removal of /etc/bash_completion.d/xm from the package since
|
|
||||||
bash-completion ships a more elaborate version of that file. (Closes:
|
|
||||||
#566683, #550590, LP: #538917, #484098)
|
|
||||||
* Downgrade reiserfsprogs and xfsprogs to Suggests. (Closes: #561618,
|
|
||||||
LP: #80233)
|
|
||||||
* Added evms-cli to Suggests. It has been removed from Debian before
|
|
||||||
Lenny, but it is necessary for some optional functionality of
|
|
||||||
xen-tools. And since some Debian derived distributions (e.g. Ubuntu
|
|
||||||
LTS and grml) still support it, it's included for the sake of
|
|
||||||
completeness and correctness.
|
|
||||||
* Added cfengine2 to Suggests. It is helpful to have it installed when
|
|
||||||
using the cfengine2 role.
|
|
||||||
* Bump Standards-Version to 3.8.4 (no changes necessary)
|
|
||||||
* Bump Debhelper Compatibility to 7
|
|
||||||
- Replace "dh_clean -k" by "dh_prep"
|
|
||||||
* Add Vcs-* headers pointing to new upstream and packaging repository
|
|
||||||
* Fix some Lintian warnings:
|
|
||||||
- [debian/control]: debhelper-but-no-misc-depends
|
|
||||||
- [debian/copyright]: copyright-without-copyright-notice
|
|
||||||
- [debian/source/format]: missing-debian-source-format
|
|
||||||
* Added a README.source explaining how to build xen-tools directly from
|
|
||||||
the Git repository.
|
|
||||||
* Overhauled package description
|
|
||||||
|
|
||||||
-- Axel Beckert <abe@debian.org> Mon, 17 May 2010 13:32:04 +0200
|
|
||||||
|
|
||||||
xen-tools (4.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
- New command line argument '--no-hosts' to avoid touching /etc/hosts
|
|
||||||
on dom0
|
|
||||||
- New command line argument '--pygrub' to setup a guest for pygrub use.
|
|
||||||
- Generated configuration file should work for --image-dev + --swap-dev
|
|
||||||
again.
|
|
||||||
- Always use /dev/pts for new images.
|
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Sun, 23 Nov 2008 13:06:01 +0000
|
|
||||||
|
|
||||||
xen-tools (3.9-6) unstable; urgency=low
|
|
||||||
|
|
||||||
- Allow command line flags to be unset.
|
|
||||||
Thanks to Ruud Koolen for the patch.
|
|
||||||
(Closes: #484338)
|
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Tue, 14 Oct 2008 22:00:22 +0000
|
|
||||||
|
|
||||||
xen-tools (3.9-5) unstable; urgency=medium
|
|
||||||
|
|
||||||
- Record the ARCH for RPM-based distros.
|
|
||||||
(Closes: #475125)
|
|
||||||
- Abort if the generated configuration file already exists.
|
|
||||||
(Closes: #499475)
|
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Mon, 13 Oct 2008 19:20:21 +0000
|
|
||||||
|
|
||||||
xen-tools (3.9-4) unstable; urgency=high
|
|
||||||
|
|
||||||
* Changed two defaults in xen-tools.conf to conform
|
|
||||||
to the defaults used by the xen packages:
|
|
||||||
+ serial_device: tty1 -> hvc0
|
|
||||||
+ disk_device: sda -> xvda
|
|
||||||
|
|
||||||
* Priority High because of RC bug. (closes: #499282)
|
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Tue, 30 Sep 2008 02:02:21 +0300
|
|
||||||
|
|
||||||
xen-tools (3.9-3) unstable; urgency=medium
|
|
||||||
|
|
||||||
- Ensure that Fedora guests get /dev/pts mounted.
|
|
||||||
Thanks to Giovanni Biscuolo (Closes: #474919)
|
|
||||||
- Add the new hostnames to /etc/hosts on the dom0 in the correct order.
|
|
||||||
Thanks to Wolfgang Karall (Closes: #477775)
|
|
||||||
- Ensure that packages are remoed non-interactively for scripted stuff.
|
|
||||||
Thanks to Wolfgang Karall (Closes: #477629)
|
|
||||||
- Correctly handle custom partitioning systems.
|
|
||||||
Thanks to Stéphane AICARDI (Closes: #477334)
|
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Wed, 20 Feb 2007 21:22:23 +0000
|
|
||||||
|
|
||||||
xen-tools (3.9-2) unstable; urgency=high
|
|
||||||
|
|
||||||
- Ensure that the hook scripts which setup networking details for
|
|
||||||
Debian & Ubuntu guests will correctly setup teh broadcast address.
|
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Wed, 20 Feb 2007 21:22:23 +0000
|
|
||||||
|
|
||||||
xen-tools (3.9-1) unstable; urgency=low
|
xen-tools (3.9-1) unstable; urgency=low
|
||||||
|
|
||||||
- general:
|
- general:
|
||||||
@@ -167,9 +37,9 @@ xen-tools (3.8-1) unstable; urgency=low
|
|||||||
(Closes: #439233)
|
(Closes: #439233)
|
||||||
* Use 'apt-get remove' rather than 'dpkg --purge' when removing packages
|
* Use 'apt-get remove' rather than 'dpkg --purge' when removing packages
|
||||||
in hooks. (Closes: #441981)
|
in hooks. (Closes: #441981)
|
||||||
|
|
||||||
[ Radu Spineanu ]
|
[ Radu Spineanu ]
|
||||||
* debian/control: Roland Stigge and I switched maintainer places.
|
* debian/control: Roland Stigge and I switched maintainer places.
|
||||||
* debian/control: Added Steve Kemp to Uploaders.
|
* debian/control: Added Steve Kemp to Uploaders.
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Wed, 03 Oct 2007 00:39:58 +0300
|
-- Radu Spineanu <radu@debian.org> Wed, 03 Oct 2007 00:39:58 +0300
|
||||||
@@ -279,8 +149,8 @@ xen-tools (3.0-1) unstable; urgency=low
|
|||||||
|
|
||||||
xen-tools (3.0~beta1-2) unstable; urgency=low
|
xen-tools (3.0~beta1-2) unstable; urgency=low
|
||||||
|
|
||||||
* Remove old symlinks and directories during preinst. (closes: #401834)
|
* Remove old symlinks and directories during preinst. (closes: #401834)
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Wed, 6 Dec 2006 15:58:44 +0200
|
-- Radu Spineanu <radu@debian.org> Wed, 6 Dec 2006 15:58:44 +0200
|
||||||
|
|
||||||
xen-tools (3.0~beta1-1) unstable; urgency=low
|
xen-tools (3.0~beta1-1) unstable; urgency=low
|
||||||
@@ -288,7 +158,7 @@ xen-tools (3.0~beta1-1) unstable; urgency=low
|
|||||||
* Development snapshot
|
* Development snapshot
|
||||||
* Mention the --mac option in the man page.
|
* Mention the --mac option in the man page.
|
||||||
(closes: #399708)
|
(closes: #399708)
|
||||||
* Set the locale version to 'C' to avoid perl warnings.
|
* Set the locale version to 'C' to avoid perl warnings.
|
||||||
(closes: #399778)
|
(closes: #399778)
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Mon, 4 Dec 2006 16:55:31 +0200
|
-- Radu Spineanu <radu@debian.org> Mon, 4 Dec 2006 16:55:31 +0200
|
||||||
@@ -311,7 +181,7 @@ xen-tools (2.8-2) unstable; urgency=low
|
|||||||
|
|
||||||
xen-tools (2.8-1) unstable; urgency=low
|
xen-tools (2.8-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release
|
* New upstream release
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Wed, 8 Nov 2006 00:35:40 +0200
|
-- Radu Spineanu <radu@debian.org> Wed, 8 Nov 2006 00:35:40 +0200
|
||||||
|
|
||||||
@@ -333,13 +203,13 @@ xen-tools (2.7-3) unstable; urgency=low
|
|||||||
|
|
||||||
xen-tools (2.7-2) unstable; urgency=low
|
xen-tools (2.7-2) unstable; urgency=low
|
||||||
|
|
||||||
* Fixed 2.6-2 changelog entry.
|
* Fixed 2.6-2 changelog entry.
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Sat, 14 Oct 2006 02:21:25 +0300
|
-- Radu Spineanu <radu@debian.org> Sat, 14 Oct 2006 02:21:25 +0300
|
||||||
|
|
||||||
xen-tools (2.7-1) unstable; urgency=low
|
xen-tools (2.7-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release
|
* New upstream release
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Sat, 14 Oct 2006 02:16:20 +0300
|
-- Radu Spineanu <radu@debian.org> Sat, 14 Oct 2006 02:16:20 +0300
|
||||||
|
|
||||||
@@ -400,7 +270,7 @@ xen-tools (2.3-1) unstable; urgency=high
|
|||||||
using a specific version of debootstrap.
|
using a specific version of debootstrap.
|
||||||
- Updated manpages to avoid word-wrapping.
|
- Updated manpages to avoid word-wrapping.
|
||||||
- Updated --noswap option such that a LVM swap volume isn't created.
|
- Updated --noswap option such that a LVM swap volume isn't created.
|
||||||
- Reverted the usage of '--keep-debootstrap-dir' since that is a
|
- Reverted the usage of '--keep-debootstrap-dir' since that is a
|
||||||
"recent" thing. Will switch to keeping a global logfile for error
|
"recent" thing. Will switch to keeping a global logfile for error
|
||||||
purposes.
|
purposes.
|
||||||
(Closes: #383589)
|
(Closes: #383589)
|
||||||
@@ -442,7 +312,7 @@ xen-tools (2.2-2) unstable; urgency=low
|
|||||||
xen-tools (2.2-1) unstable; urgency=high
|
xen-tools (2.2-1) unstable; urgency=high
|
||||||
|
|
||||||
* New upstream release, fixes several important bugs hence urgency=high.
|
* New upstream release, fixes several important bugs hence urgency=high.
|
||||||
- /etc/fstab creation generated correctly for reiserfs
|
- /etc/fstab creation generated correctly for reiserfs
|
||||||
(Closes: #379023) (Closes: #379096)
|
(Closes: #379023) (Closes: #379096)
|
||||||
- --force works with xfs filesystems.
|
- --force works with xfs filesystems.
|
||||||
(Closes: #377684)
|
(Closes: #377684)
|
||||||
@@ -493,7 +363,7 @@ xen-tools (2.0-1) unstable; urgency=low
|
|||||||
(Closes: #373800)
|
(Closes: #373800)
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Tue, 20 Jun 2006 09:57:45 +0000
|
-- Steve Kemp <skx@debian.org> Tue, 20 Jun 2006 09:57:45 +0000
|
||||||
|
|
||||||
xen-tools (1.6-1) unstable; urgency=low
|
xen-tools (1.6-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release (closes: #368983)
|
* New upstream release (closes: #368983)
|
||||||
@@ -536,26 +406,26 @@ xen-tools (1.4-1) unstable; urgency=low
|
|||||||
(Closes: #363070)
|
(Closes: #363070)
|
||||||
* Added new option --initrd to specify the initial ramdisk.
|
* Added new option --initrd to specify the initial ramdisk.
|
||||||
(Closes: #365500)
|
(Closes: #365500)
|
||||||
|
|
||||||
-- Steve Kemp <skx@debian.org> Sun, 7 May 2006 14:43:43 +0000
|
-- Steve Kemp <skx@debian.org> Sun, 7 May 2006 14:43:43 +0000
|
||||||
|
|
||||||
xen-tools (1.3-1) unstable; urgency=low
|
xen-tools (1.3-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release
|
* New upstream release
|
||||||
+ Ignore .dpkg-(new|old) files in the hooks directory
|
+ Ignore .dpkg-(new|old) files in the hooks directory
|
||||||
(closes: #357716)
|
(closes: #357716)
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Sat, 15 Apr 2006 13:44:36 +0300
|
-- Radu Spineanu <radu@debian.org> Sat, 15 Apr 2006 13:44:36 +0300
|
||||||
|
|
||||||
xen-tools (1.1-1) unstable; urgency=low
|
xen-tools (1.1-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream release
|
* New upstream release
|
||||||
+ Disk devices are no longer created one unit bigger than asked
|
+ Disk devices are no longer created one unit bigger than asked
|
||||||
(closes: #353155)
|
(closes: #353155)
|
||||||
+ Populate /dev on the virtual server (closes: #352942)
|
+ Populate /dev on the virtual server (closes: #352942)
|
||||||
+ Added --use-ide flag in case people want ide style device names
|
+ Added --use-ide flag in case people want ide style device names
|
||||||
(closes: #352937)
|
(closes: #352937)
|
||||||
+ xen.cfg is no longer broken when using LVM
|
+ xen.cfg is no longer broken when using LVM
|
||||||
|
|
||||||
-- Radu Spineanu <radu@debian.org> Tue, 21 Feb 2006 01:28:28 +0200
|
-- Radu Spineanu <radu@debian.org> Tue, 21 Feb 2006 01:28:28 +0200
|
||||||
|
|
||||||
|
|||||||
2
debian/compat
vendored
2
debian/compat
vendored
@@ -1 +1 @@
|
|||||||
7
|
4
|
||||||
|
|||||||
38
debian/control
vendored
38
debian/control
vendored
@@ -1,38 +1,18 @@
|
|||||||
Source: xen-tools
|
Source: xen-tools
|
||||||
Section: utils
|
Section: utils
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Maintainer: Axel Beckert <abe@debian.org>
|
Maintainer: Roland Stigge <stigge@antcom.de>
|
||||||
Build-Depends: debhelper (>= 7.0.0), libtest-pod-perl, libtext-template-perl
|
Uploaders: Radu Spineanu <radu@debian.org>, Steve Kemp <skx@debian.org>
|
||||||
Standards-Version: 3.8.4
|
Build-Depends: debhelper (>= 4.0.0), libtest-pod-perl, libtext-template-perl
|
||||||
|
Standards-Version: 3.7.3
|
||||||
Homepage: http://xen-tools.org/software/xen-tools
|
Homepage: http://xen-tools.org/software/xen-tools
|
||||||
Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
|
|
||||||
Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
|
|
||||||
|
|
||||||
Package: xen-tools
|
Package: xen-tools
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends}
|
Depends: debootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl
|
||||||
Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse, xen-shell, libexpect-perl
|
Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, reiserfsprogs, xfsprogs, rinse, xen-shell, libexpect-perl
|
||||||
Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2, evms-cli
|
Description: Tools to manage Debian XEN virtual servers
|
||||||
Description: Tools to manage Xen virtual servers
|
This package contains tools to manage Debian based XEN virtual servers.
|
||||||
This package contains tools to manage Debian based Xen virtual servers.
|
|
||||||
.
|
.
|
||||||
Using the scripts you can easily create fully configured Xen guest
|
Using the scripts you can easily create fully configured Xen guest
|
||||||
domains (DomU) which can be listed, updated, or copied easily.
|
domains (domU) which can be listed, updated, or copied easily.
|
||||||
.
|
|
||||||
xen-tools currently can install:
|
|
||||||
.
|
|
||||||
* Debian 3.1 Sarge (i386 only)
|
|
||||||
* Debian 4.0 Etch
|
|
||||||
* Debian 5.0 Lenny
|
|
||||||
* Debian 6.0 Squeeze
|
|
||||||
* Debian Sid (Unstable)
|
|
||||||
* Ubuntu 6.06 Dapper Drake (LTS)
|
|
||||||
* Ubuntu 6.10 Edgy Eft
|
|
||||||
* Ubuntu 7.04 Feisty Fawn
|
|
||||||
* Ubuntu 7.10 Gutsy Gibbon
|
|
||||||
* Ubuntu 8.04 Hardy Heron (LTS)
|
|
||||||
* Ubuntu 8.10 Intrepid Ibex
|
|
||||||
* Ubuntu 9.04 Jaunty Jackaplope
|
|
||||||
* Ubuntu 9.10 Karmic Koala
|
|
||||||
* Ubuntu 10.04 Lucid Lynx (LTS)
|
|
||||||
* Ubuntu 10.10 Maverick Meerkat
|
|
||||||
|
|||||||
4
debian/copyright
vendored
4
debian/copyright
vendored
@@ -3,8 +3,7 @@ Tue, 20 Dec 2005 02:21:05 +0200.
|
|||||||
|
|
||||||
It was downloaded from http://xen-tools.org/software/xen-tools/
|
It was downloaded from http://xen-tools.org/software/xen-tools/
|
||||||
|
|
||||||
Copyright 2005-2009: Steve Kemp <steve@steve.org.uk>
|
Copyright Holder: Steve Kemp <steve@steve.org.uk>
|
||||||
Copyright 2010: Axel Beckert <abe@deuxchevaux.org>
|
|
||||||
|
|
||||||
License:
|
License:
|
||||||
|
|
||||||
@@ -22,3 +21,4 @@ Perl is distributed under licenses:
|
|||||||
On Debian GNU/Linux systems, the complete text of the GNU General
|
On Debian GNU/Linux systems, the complete text of the GNU General
|
||||||
Public License can be found in /usr/share/common-licenses/GPL' and
|
Public License can be found in /usr/share/common-licenses/GPL' and
|
||||||
the Artistic Licence in /usr/share/common-licenses/Artistic'.
|
the Artistic Licence in /usr/share/common-licenses/Artistic'.
|
||||||
|
|
||||||
|
|||||||
2
debian/examples/setup-kernel-initrd
vendored
Executable file → Normal file
2
debian/examples/setup-kernel-initrd
vendored
Executable file → Normal file
@@ -53,7 +53,7 @@ cat <<EOF
|
|||||||
Press enter to continue, or Ctrl-c to abort.
|
Press enter to continue, or Ctrl-c to abort.
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
read __dummy
|
read
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
0
debian/examples/update-modules
vendored
Executable file → Normal file
0
debian/examples/update-modules
vendored
Executable file → Normal file
11
debian/preinst
vendored
Executable file → Normal file
11
debian/preinst
vendored
Executable file → Normal file
@@ -23,16 +23,5 @@ if [ -d "/usr/lib/xen-tools/ubuntu.d" ]; then
|
|||||||
rm -r /usr/lib/xen-tools/ubuntu.d
|
rm -r /usr/lib/xen-tools/ubuntu.d
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
|
||||||
# 4.1 -> 4.2
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -L "/usr/lib/xen-tools/intrepid.d" ]; then
|
|
||||||
rm /usr/lib/xen-tools/intrepid.d
|
|
||||||
fi
|
|
||||||
if [ -L "/usr/lib/xen-tools/karmic.d" ]; then
|
|
||||||
rm /usr/lib/xen-tools/karmic.d
|
|
||||||
fi
|
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
2
debian/rules
vendored
2
debian/rules
vendored
@@ -25,7 +25,7 @@ clean:
|
|||||||
install: build
|
install: build
|
||||||
dh_testdir
|
dh_testdir
|
||||||
dh_testroot
|
dh_testroot
|
||||||
dh_prep
|
dh_clean -k
|
||||||
|
|
||||||
make manpages
|
make manpages
|
||||||
make install prefix=`pwd`/debian/xen-tools
|
make install prefix=`pwd`/debian/xen-tools
|
||||||
|
|||||||
1
debian/source/format
vendored
1
debian/source/format
vendored
@@ -1 +0,0 @@
|
|||||||
1.0
|
|
||||||
@@ -52,7 +52,7 @@
|
|||||||
# LVM volume group here instead
|
# LVM volume group here instead
|
||||||
#
|
#
|
||||||
##
|
##
|
||||||
# lvm = vg0
|
# lvm = skx-vg
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -130,7 +130,7 @@ memory = 128Mb # Memory size
|
|||||||
swap = 128Mb # Swap size
|
swap = 128Mb # Swap size
|
||||||
# noswap = 1 # Don't use swap at all for the new system.
|
# noswap = 1 # Don't use swap at all for the new system.
|
||||||
fs = ext3 # use the EXT3 filesystem for the disk image.
|
fs = ext3 # use the EXT3 filesystem for the disk image.
|
||||||
dist = `xt-guess-suite-and-mirror -s` # Default distribution to install.
|
dist = etch # Default distribution to install.
|
||||||
image = sparse # Specify sparse vs. full disk images.
|
image = sparse # Specify sparse vs. full disk images.
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -211,7 +211,7 @@ initrd = /boot/initrd.img-`uname -r`
|
|||||||
#
|
#
|
||||||
# The default mirror for debootstrap to install Debian-derived distributions
|
# The default mirror for debootstrap to install Debian-derived distributions
|
||||||
#
|
#
|
||||||
mirror = `xt-guess-suite-and-mirror -m`
|
mirror = http://ftp.us.debian.org/debian/
|
||||||
|
|
||||||
#
|
#
|
||||||
# A mirror suitable for use when installing the Dapper release of Ubuntu.
|
# A mirror suitable for use when installing the Dapper release of Ubuntu.
|
||||||
@@ -248,17 +248,17 @@ reiser_options = defaults
|
|||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If you're using the lenny or later version of the Xen guest kernel you will
|
# If you're using a newer version of the Xen guest kernel you will
|
||||||
# need to make sure that you use 'hvc0' for the guest serial device,
|
# need to make sure that you use 'xvc0' for the guest serial device,
|
||||||
# and 'xvdX' instead of 'sdX' for serial devices.
|
# and 'xvdX' instead of 'sdX' for serial devices.
|
||||||
#
|
#
|
||||||
# You may specify the things to use here:
|
# You may specify the things to use here:
|
||||||
#
|
#
|
||||||
# serial_device = hvc0 #default
|
# serial_device = tty1 #default
|
||||||
# serial_device = tty1
|
# serial_device = xvc0
|
||||||
#
|
#
|
||||||
# disk_device = xvda #default
|
# disk_device = sda #default
|
||||||
# disk_device = sda
|
# disk_device = xvda
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
115
etc/xm.tmpl
115
etc/xm.tmpl
@@ -6,89 +6,37 @@
|
|||||||
#
|
#
|
||||||
# Kernel + memory size
|
# Kernel + memory size
|
||||||
#
|
#
|
||||||
{ if ( ( $kernel ) && ( !defined($pygrub)) )
|
{ if ( $kernel )
|
||||||
{
|
{
|
||||||
$OUT.= "kernel = '$kernel'";
|
$OUT.= "kernel = '$kernel'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{ if ( ( $initrd ) && ( !defined($pygrub)) )
|
{ if ( $initrd )
|
||||||
{
|
{
|
||||||
$OUT.= "ramdisk = '$initrd'";
|
$OUT.= "ramdisk = '$initrd'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
|
||||||
if ( $pygrub )
|
|
||||||
{
|
|
||||||
my $pygrub_bin = '';
|
|
||||||
foreach my $pygrub_path (reverse glob('/usr/lib/xen-*/bin/pygrub
|
|
||||||
/usr/lib/xen-default/bin/pygrub
|
|
||||||
/usr/*bin/pygrub')) {
|
|
||||||
if (-x $pygrub_path) {
|
|
||||||
$pygrub_bin = $pygrub_path;
|
|
||||||
last;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
die "pygrub not found" unless $pygrub_bin;
|
|
||||||
|
|
||||||
$OUT .= "bootloader = '$pygrub_bin'\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
vcpus = '{$vcpus}'
|
|
||||||
memory = '{$memory}'
|
memory = '{$memory}'
|
||||||
|
|
||||||
#
|
#
|
||||||
# Disk device(s).
|
# Disk device(s).
|
||||||
#
|
#
|
||||||
{
|
{
|
||||||
if ( !defined($image_vbd ) )
|
for ( my $i = 0; $i <= $#PARTITIONS; $i++ )
|
||||||
{
|
{
|
||||||
for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
|
|
||||||
{
|
|
||||||
if ( $PARTITIONS[$i]{'mountpoint'} eq '/' )
|
if ( $PARTITIONS[$i]{'mountpoint'} eq '/' )
|
||||||
{
|
{
|
||||||
$OUT .= "root = '/dev/$device" . ($i + 1) . " ro'\n";
|
$OUT .= "root = '/dev/$device" . ($i + 1) . " ro'\n";
|
||||||
}
|
}
|
||||||
}
|
|
||||||
$OUT .= "disk = [\n";
|
|
||||||
for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
|
|
||||||
{
|
|
||||||
$OUT .= " '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
|
|
||||||
}
|
|
||||||
$OUT .= " ]\n";
|
|
||||||
}
|
}
|
||||||
|
$OUT .= "disk = [\n";
|
||||||
|
for ( my $i = 0; $i <= $#PARTITIONS; $i++ )
|
||||||
|
{
|
||||||
|
$OUT .= " '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
|
||||||
|
}
|
||||||
|
$OUT .= " ]\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Physical volumes
|
|
||||||
#
|
|
||||||
{
|
|
||||||
if ( ( $swap_vbd ) && ( $image_vbd ) )
|
|
||||||
{
|
|
||||||
$OUT .= "root = '/dev/$device" . "2 ro'\n";
|
|
||||||
|
|
||||||
$OUT .= "disk = [ ";
|
|
||||||
|
|
||||||
if ( $image_vbd )
|
|
||||||
{
|
|
||||||
$OUT .= "'$image_vbd," . $device . "2,w'";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $swap_vbd )
|
|
||||||
{
|
|
||||||
if ( $image_vbd )
|
|
||||||
{
|
|
||||||
$OUT .= ",";
|
|
||||||
}
|
|
||||||
|
|
||||||
$OUT .= "'$swap_vbd," . $device . "1,w'";
|
|
||||||
}
|
|
||||||
$OUT .= " ]\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Hostname
|
# Hostname
|
||||||
#
|
#
|
||||||
@@ -104,26 +52,12 @@ name = '{$hostname}'
|
|||||||
# Setup the mac address, if present.
|
# Setup the mac address, if present.
|
||||||
my $m = '';
|
my $m = '';
|
||||||
if ( $mac )
|
if ( $mac )
|
||||||
{
|
{
|
||||||
$m = "mac=$mac"
|
$m = "mac=$mac"
|
||||||
}
|
}
|
||||||
my $br = '';
|
|
||||||
if ( $bridge )
|
$OUT .= "vif = [ '$m' ]";
|
||||||
{
|
}
|
||||||
if ( $mac )
|
|
||||||
{
|
|
||||||
$br = ",bridge=$bridge"
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$br = "bridge=$bridge"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$OUT .= "vif = [ '";
|
|
||||||
$OUT .= "$m";
|
|
||||||
$OUT .= "$br";
|
|
||||||
$OUT .= "' ]";
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#
|
#
|
||||||
@@ -131,27 +65,12 @@ name = '{$hostname}'
|
|||||||
#
|
#
|
||||||
my $m = '';
|
my $m = '';
|
||||||
if ( $mac )
|
if ( $mac )
|
||||||
{
|
{
|
||||||
$m = ",mac=$mac"
|
$m = ",mac=$mac"
|
||||||
}
|
}
|
||||||
|
|
||||||
my $vn = '';
|
$OUT .= "vif = [ 'ip=$ip1";
|
||||||
if ( $vifname )
|
$OUT .= "$m' ]";
|
||||||
{
|
|
||||||
$vn = ",vifname=$vifname";
|
|
||||||
}
|
|
||||||
|
|
||||||
my $br = '';
|
|
||||||
if ( $bridge )
|
|
||||||
{
|
|
||||||
$br = ",bridge=$bridge"
|
|
||||||
}
|
|
||||||
|
|
||||||
$OUT .= "vif = [ 'ip=$ip1";
|
|
||||||
$OUT .= "$m";
|
|
||||||
$OUT .= "$vn";
|
|
||||||
$OUT .= "$br";
|
|
||||||
$OUT .= "' ]";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Record arch, if present.
|
|
||||||
#
|
|
||||||
if [ -d $prefix/etc/rpm ]; then
|
|
||||||
|
|
||||||
logMessage Found /etc/rpm
|
|
||||||
|
|
||||||
#
|
|
||||||
# If i386 then record this
|
|
||||||
#
|
|
||||||
if [ "$arch" = "i386" ]; then
|
|
||||||
echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage Failed to find /etc/rpm
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Do the transformation.
|
# Do the transformation.
|
||||||
#
|
#
|
||||||
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
|
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -79,7 +79,6 @@ DEVICE=eth0
|
|||||||
BOOTPROTO=dhcp
|
BOOTPROTO=dhcp
|
||||||
ONBOOT=yes
|
ONBOOT=yes
|
||||||
E_O_DHCP
|
E_O_DHCP
|
||||||
chroot ${prefix} /usr/bin/yum -y install dhclient
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Setup the mailname + hostname files.
|
# Setup the mailname + hostname files.
|
||||||
#
|
#
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
echo ${hostname} > ${prefix}/etc/hostname
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
echo ${hostname} > ${prefix}/etc/mailname
|
||||||
|
|
||||||
|
|
||||||
@@ -89,27 +89,23 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
|
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
|
# and there is an installation of dnsmasq installed then
|
||||||
|
# reload it.
|
||||||
|
#
|
||||||
|
# This will let the local LAN clients lookup the new address.
|
||||||
|
#
|
||||||
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
#
|
logMessage Allowing DNSMasq to restart.
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
# and there is an installation of dnsmasq installed then
|
|
||||||
# reload it.
|
|
||||||
#
|
|
||||||
# This will let the local LAN clients lookup the new address.
|
|
||||||
#
|
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -36,19 +36,15 @@ logMessage Filesystem options are ${options}
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
@@ -68,7 +64,6 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|||||||
#
|
#
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
# <file system> <mount point> <type> <options> <dump> <pass>
|
||||||
proc /proc proc defaults 0 0
|
proc /proc proc defaults 0 0
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
E_O_FSTAB
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
for part in `seq 1 ${NUMPARTITIONS}`; do
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
eval "PARTITION=\"\${PARTITION${part}}\""
|
||||||
@@ -80,7 +75,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
x=$(( $x+1 ))
|
x=$(( $x+1 ))
|
||||||
done
|
done
|
||||||
IFS="${OLDIFS}"
|
IFS="${OLDIFS}"
|
||||||
|
|
||||||
case "${partdata2}" in
|
case "${partdata2}" in
|
||||||
xfs)
|
xfs)
|
||||||
has_xfs=1
|
has_xfs=1
|
||||||
@@ -89,7 +84,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
has_reiserfs=1
|
has_reiserfs=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
if [ "${partdata2}" = "swap" ]; then
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Record arch, if present.
|
|
||||||
#
|
|
||||||
if [ -d $prefix/etc/rpm ]; then
|
|
||||||
|
|
||||||
logMessage Found /etc/rpm
|
|
||||||
|
|
||||||
#
|
|
||||||
# If i386 then record this
|
|
||||||
#
|
|
||||||
if [ "$arch" = "i386" ]; then
|
|
||||||
echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage Failed to find /etc/rpm
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Do the transformation.
|
# Do the transformation.
|
||||||
#
|
#
|
||||||
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
|
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -79,7 +79,6 @@ DEVICE=eth0
|
|||||||
BOOTPROTO=dhcp
|
BOOTPROTO=dhcp
|
||||||
ONBOOT=yes
|
ONBOOT=yes
|
||||||
E_O_DHCP
|
E_O_DHCP
|
||||||
chroot ${prefix} /usr/bin/yum -y install dhclient
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Setup the mailname + hostname files.
|
# Setup the mailname + hostname files.
|
||||||
#
|
#
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
echo ${hostname} > ${prefix}/etc/hostname
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
echo ${hostname} > ${prefix}/etc/mailname
|
||||||
|
|
||||||
|
|
||||||
@@ -89,24 +89,23 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
#
|
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
|
||||||
# and there is an installation of dnsmasq installed then
|
|
||||||
# reload it.
|
|
||||||
#
|
|
||||||
# This will let the local LAN clients lookup the new address.
|
|
||||||
#
|
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
#
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
fi
|
# and there is an installation of dnsmasq installed then
|
||||||
|
# reload it.
|
||||||
|
#
|
||||||
|
# This will let the local LAN clients lookup the new address.
|
||||||
|
#
|
||||||
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
|
logMessage Allowing DNSMasq to restart.
|
||||||
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -37,19 +37,15 @@ logMessage Filesystem options are ${options}
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
# might develop.
|
# might develop.
|
||||||
#
|
#
|
||||||
# Steve
|
# Steve
|
||||||
# --
|
# --
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@ installDebianPackage ()
|
|||||||
#
|
#
|
||||||
# Use policy-rc to stop any daemons from starting.
|
# Use policy-rc to stop any daemons from starting.
|
||||||
#
|
#
|
||||||
printf '#!/bin/bash\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d
|
echo -e '#!/bin/bash\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d
|
||||||
chmod +x ${prefix}/usr/sbin/policy-rc.d
|
chmod +x ${prefix}/usr/sbin/policy-rc.d
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -98,9 +98,7 @@ installDebianPackage ()
|
|||||||
#
|
#
|
||||||
# Install the packages
|
# Install the packages
|
||||||
#
|
#
|
||||||
mount -t devpts devpts ${prefix}/dev/pts
|
|
||||||
DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
|
DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
|
||||||
umount ${prefix}/dev/pts
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Remove the policy-rc.d script.
|
# Remove the policy-rc.d script.
|
||||||
@@ -132,7 +130,7 @@ disableStartStopDaemon ()
|
|||||||
chmod 755 "${daemonfile}"
|
chmod 755 "${daemonfile}"
|
||||||
logMessage "start-stop-daemon disabled / made a stub."
|
logMessage "start-stop-daemon disabled / made a stub."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -153,7 +151,7 @@ enableStartStopDaemon ()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -184,7 +182,7 @@ removeDebianPackage ()
|
|||||||
#
|
#
|
||||||
# Purge the packages we've been given.
|
# Purge the packages we've been given.
|
||||||
#
|
#
|
||||||
chroot ${prefix} /usr/bin/apt-get remove --yes --purge "$@"
|
chroot ${prefix} /usr/bin/apt-get remove --purge "$@"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -220,28 +218,6 @@ installCentOS4Package ()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install a package using whatever package management tool is available
|
|
||||||
#
|
|
||||||
installPackage ()
|
|
||||||
{
|
|
||||||
prefix=$1
|
|
||||||
package=$2
|
|
||||||
|
|
||||||
if [ -x ${prefix}/usr/bin/apt-get ] ; then
|
|
||||||
installDebianPackage "$@"
|
|
||||||
|
|
||||||
elif [ -x ${prefix}/usr/bin/yum ] ; then
|
|
||||||
installCentOS4Package "$@"
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage "Unable to install package ${package}; no package manager found"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Install a package upon a gentoo system via emerge.
|
# Install a package upon a gentoo system via emerge.
|
||||||
#
|
#
|
||||||
@@ -256,7 +232,7 @@ installGentooPackage ()
|
|||||||
# Log our options
|
# Log our options
|
||||||
#
|
#
|
||||||
logMessage "Installing Gentoo package ${package} to prefix ${prefix}"
|
logMessage "Installing Gentoo package ${package} to prefix ${prefix}"
|
||||||
|
|
||||||
logMessage "NOTE: Not doing anything - this is a stub - FIXME"
|
logMessage "NOTE: Not doing anything - this is a stub - FIXME"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Switch off the gettys for everything other than tty1.
|
# Switch off the gettys for everything other than tty1.
|
||||||
#
|
#
|
||||||
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
|
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Setup the mailname + hostname files.
|
# Setup the mailname + hostname files.
|
||||||
#
|
#
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
echo ${hostname} > ${prefix}/etc/hostname
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
echo ${hostname} > ${prefix}/etc/mailname
|
||||||
|
|
||||||
|
|
||||||
@@ -89,25 +89,24 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
# and there is an installation of dnsmasq installed then
|
# and there is an installation of dnsmasq installed then
|
||||||
# reload it.
|
# reload it.
|
||||||
#
|
#
|
||||||
# This will let the local LAN clients lookup the new address.
|
# This will let the local LAN clients lookup the new address.
|
||||||
#
|
#
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
logMessage Allowing DNSMasq to restart.
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
|
||||||
fi
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ logMessage Script $0 starting
|
|||||||
# Copy "required" files from our host.
|
# Copy "required" files from our host.
|
||||||
#
|
#
|
||||||
cp /etc/timezone ${prefix}/etc
|
cp /etc/timezone ${prefix}/etc
|
||||||
cp /etc/localtime ${prefix}/etc
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If the host has sudo then copy the configuration file, and install
|
# If the host has sudo then copy the configuration file, and install
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -33,19 +33,15 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
@@ -65,7 +61,6 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|||||||
#
|
#
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
# <file system> <mount point> <type> <options> <dump> <pass>
|
||||||
proc /proc proc defaults 0 0
|
proc /proc proc defaults 0 0
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
E_O_FSTAB
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
for part in `seq 1 ${NUMPARTITIONS}`; do
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
eval "PARTITION=\"\${PARTITION${part}}\""
|
||||||
@@ -77,7 +72,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
x=$(( $x+1 ))
|
x=$(( $x+1 ))
|
||||||
done
|
done
|
||||||
IFS="${OLDIFS}"
|
IFS="${OLDIFS}"
|
||||||
|
|
||||||
case "${partdata2}" in
|
case "${partdata2}" in
|
||||||
xfs)
|
xfs)
|
||||||
has_xfs=1
|
has_xfs=1
|
||||||
@@ -86,7 +81,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
has_reiserfs=1
|
has_reiserfs=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
if [ "${partdata2}" = "swap" ]; then
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -76,12 +76,9 @@ E_O_APT
|
|||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If the host system has security support then enable that here, too,
|
# If the host system has security support then enable that here too.
|
||||||
# except if we're installing Debian Unstable.
|
|
||||||
#
|
#
|
||||||
if ( test "${dist}" '!=' 'sid' && test "${dist}" '!=' 'unstable' && \
|
if ( grep ^deb.*security.debian.org /etc/apt/sources.list >/dev/null 2>/dev/null ) ; then
|
||||||
test -e /etc/apt/sources.list && \
|
|
||||||
grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
|
|
||||||
|
|
||||||
cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
|
cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Do the transformation.
|
# Do the transformation.
|
||||||
#
|
#
|
||||||
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
|
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ setupStaticNetworking ()
|
|||||||
#
|
#
|
||||||
bcast='';
|
bcast='';
|
||||||
if [ ! -z "${broadcast}" ]; then
|
if [ ! -z "${broadcast}" ]; then
|
||||||
bcast=" broadcast ${broadcast}"
|
bcast=' broadcast ${broadcast}'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Setup the mailname + hostname files.
|
# Setup the mailname + hostname files.
|
||||||
#
|
#
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
echo ${hostname} > ${prefix}/etc/hostname
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
echo ${hostname} > ${prefix}/etc/mailname
|
||||||
|
|
||||||
|
|
||||||
@@ -42,14 +42,10 @@ echo ${hostname} > ${prefix}/etc/mailname
|
|||||||
if [ -z "${dhcp}" ]; then
|
if [ -z "${dhcp}" ]; then
|
||||||
|
|
||||||
# Non-IPv6 stuff.
|
# Non-IPv6 stuff.
|
||||||
# TODO: Think of a better way of doing this, this may have a lot of trash
|
|
||||||
# depending on the dom0 (i.e. 127.0.0.1 dom0.example.com)
|
|
||||||
grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
|
grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
|
||||||
|
|
||||||
# New entry.
|
# New entry.
|
||||||
# echo "127.0.0.1 localhost" >> ${prefix}/etc/hosts
|
echo "${ip1} ${hostname}" >> ${prefix}/etc/hosts
|
||||||
echo "127.0.1.1 $(echo ${hostname} | awk -F '.' '{ print $1 }')" >> ${prefix}/etc/hosts
|
|
||||||
echo "${ip1} ${hostname}" >> ${prefix}/etc/hosts
|
|
||||||
echo " " >> ${prefix}/etc/hosts
|
echo " " >> ${prefix}/etc/hosts
|
||||||
|
|
||||||
# IPv6 stuff.
|
# IPv6 stuff.
|
||||||
@@ -61,8 +57,7 @@ else
|
|||||||
# Stub /etc/hosts for DHCP clients.
|
# Stub /etc/hosts for DHCP clients.
|
||||||
#
|
#
|
||||||
cat >> ${prefix}/etc/hosts <<EOF
|
cat >> ${prefix}/etc/hosts <<EOF
|
||||||
127.0.0.1 localhost
|
127.0.0.1 localhost
|
||||||
127.0.1.1 $(echo ${hostname} | awk -F '.' '{ print $1 }') ${hostname}
|
|
||||||
|
|
||||||
# The following lines are desirable for IPv6 capable hosts
|
# The following lines are desirable for IPv6 capable hosts
|
||||||
::1 ip6-localhost ip6-loopback
|
::1 ip6-localhost ip6-loopback
|
||||||
@@ -94,24 +89,23 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
# and there is an installation of dnsmasq installed then
|
# and there is an installation of dnsmasq installed then
|
||||||
# reload it.
|
# reload it.
|
||||||
#
|
#
|
||||||
# This will let the local LAN clients lookup the new address.
|
# This will let the local LAN clients lookup the new address.
|
||||||
#
|
#
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
logMessage Allowing DNSMasq to restart.
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
|
||||||
fi
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -26,19 +26,6 @@ fi
|
|||||||
#
|
#
|
||||||
logMessage Script $0 starting
|
logMessage Script $0 starting
|
||||||
|
|
||||||
#
|
|
||||||
# Test where MAKEDEV is located, assuming /sbin/ as default
|
|
||||||
#
|
|
||||||
MAKEDEV=''
|
|
||||||
MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV"
|
|
||||||
for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do
|
|
||||||
if [ -x "${prefix}${MAKEDEV_PATH}" ]; then
|
|
||||||
MAKEDEV="${prefix}${MAKEDEV_PATH}"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -n "${MAKEDEV}" ]; then
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Early termination if we have a couple of common devices present
|
# Early termination if we have a couple of common devices present
|
||||||
@@ -49,10 +36,10 @@ if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then
|
|||||||
# We still need to make sure the basic devices are present
|
# We still need to make sure the basic devices are present
|
||||||
#
|
#
|
||||||
cd ${prefix}/dev
|
cd ${prefix}/dev
|
||||||
${MAKEDEV} std
|
./MAKEDEV std
|
||||||
${MAKEDEV} hda
|
./MAKEDEV hda
|
||||||
${MAKEDEV} sda
|
./MAKEDEV sda
|
||||||
${MAKEDEV} tty1
|
./MAKEDEV tty1
|
||||||
|
|
||||||
logMessage "Terminating because there appear to be files in /dev already"
|
logMessage "Terminating because there appear to be files in /dev already"
|
||||||
exit
|
exit
|
||||||
@@ -63,10 +50,9 @@ fi
|
|||||||
# Make the device nodes.
|
# Make the device nodes.
|
||||||
#
|
#
|
||||||
cd ${prefix}/dev
|
cd ${prefix}/dev
|
||||||
${MAKEDEV} generic
|
./MAKEDEV generic
|
||||||
${MAKEDEV} std
|
./MAKEDEV std
|
||||||
|
|
||||||
fi # -n ${MAKEDEV}
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Log our finish
|
# Log our finish
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ logMessage Script $0 starting
|
|||||||
# Copy "required" files from our host.
|
# Copy "required" files from our host.
|
||||||
#
|
#
|
||||||
cp /etc/timezone ${prefix}/etc
|
cp /etc/timezone ${prefix}/etc
|
||||||
cp /etc/localtime ${prefix}/etc
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Install ssh
|
# Install ssh
|
||||||
#
|
#
|
||||||
installDebianPackage ${prefix} openssh-server
|
installDebianPackage ${prefix} ssh
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1,137 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# If the pygrub flag is set, this script will install the necessary
|
|
||||||
# packages to boot the VM from the dom0 via pygrub. This script installs
|
|
||||||
# the kernel and modules and generates a grub menu.lst in the newly
|
|
||||||
# created maschine.
|
|
||||||
#
|
|
||||||
# Dmitry Nedospasov
|
|
||||||
# --
|
|
||||||
# http://nedos.net
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${pygrub}" ]; then
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
#
|
|
||||||
# Resolve the correct architecutre
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ "${arch}" = "i386" ]; then
|
|
||||||
XEN_ARCH="686"
|
|
||||||
elif [ "${arch}" = "amd64" ]; then
|
|
||||||
XEN_ARCH="amd64"
|
|
||||||
elif [ -z "${arch}" ]; then
|
|
||||||
UNAME_ARCH=`uname -m`
|
|
||||||
if [ "${UNAME_ARCH}" = "i686" ]; then
|
|
||||||
XEN_ARCH="686"
|
|
||||||
elif [ "${UNAME_ARCH}" = "x86_64" ]; then
|
|
||||||
XEN_ARCH="amd64"
|
|
||||||
else
|
|
||||||
logMessage Unknown kernel architecture ${UNAME_ARCH}.
|
|
||||||
logMessage Please report this as bug to xen-tools-dev@xen-tools.org.
|
|
||||||
logMessage Script $0 failed
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
logMessage Unknown kernel architecture ${arch}
|
|
||||||
logMessage Script $0 failed
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Attempt to install a xen kernel, if that fails, then install a normal one
|
|
||||||
#
|
|
||||||
|
|
||||||
KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
|
|
||||||
KERNEL_PKG="linux-image-$XEN_ARCH"
|
|
||||||
|
|
||||||
logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
|
|
||||||
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
|
|
||||||
logMessage Package $KERNEL_XEN_PKG is available - installing
|
|
||||||
installDebianPackage ${prefix} initramfs-tools
|
|
||||||
installDebianPackage ${prefix} $KERNEL_XEN_PKG
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage Package $KERNEL_XEN_PKG is not available
|
|
||||||
logMessage Attempting to install the $KERNEL_PKG kernel image
|
|
||||||
logMessage WARNING: This kernel may not have pvops
|
|
||||||
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
|
|
||||||
logMessage Package $KERNEL_PKG is available - installing
|
|
||||||
installDebianPackage ${prefix} initramfs-tools
|
|
||||||
installDebianPackage ${prefix} $KERNEL_PKG
|
|
||||||
else
|
|
||||||
logMessage Package $KERNEL_PKG is not available
|
|
||||||
logMessage pygrub set, but kernel could not be installed
|
|
||||||
logMessage Script $0 failed
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
|
|
||||||
KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
|
|
||||||
DOMU_RAMDISK="initrd.img-$KERNEL_REV"
|
|
||||||
DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Generate initrd if it does not exist
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
|
|
||||||
logMessage initrd exists, skipping generation
|
|
||||||
else
|
|
||||||
logMessage initrd missing, generating
|
|
||||||
chroot ${prefix} update-initramfs -c -k $KERNEL_REV
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Generate a menu.lst for pygrub
|
|
||||||
#
|
|
||||||
|
|
||||||
mkdir -p ${prefix}/boot/grub
|
|
||||||
cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
|
|
||||||
default 0
|
|
||||||
timeout 2
|
|
||||||
|
|
||||||
title $DOMU_ISSUE
|
|
||||||
root (hd0,0)
|
|
||||||
kernel /boot/$DOMU_KERNEL root=/dev/xvda2 ro
|
|
||||||
initrd /boot/$DOMU_RAMDISK
|
|
||||||
|
|
||||||
title $DOMU_ISSUE (Single-User)
|
|
||||||
root (hd0,0)
|
|
||||||
kernel /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
|
|
||||||
initrd /boot/$DOMU_RAMDISK
|
|
||||||
|
|
||||||
E_O_MENU
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install the module-init-tools package.
|
|
||||||
#
|
|
||||||
|
|
||||||
installDebianPackage ${prefix} module-init-tools
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage pygrub not set, skipping kernel install
|
|
||||||
fi # if pygrub
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -31,9 +31,7 @@ fi
|
|||||||
#
|
#
|
||||||
logMessage Script $0 starting
|
logMessage Script $0 starting
|
||||||
|
|
||||||
if [ ${pygrub} ]; then
|
|
||||||
logMessage "pygrub set, skipping module install"
|
|
||||||
else
|
|
||||||
#
|
#
|
||||||
# The name of the package containing the correct modules.
|
# The name of the package containing the correct modules.
|
||||||
#
|
#
|
||||||
@@ -78,7 +76,6 @@ fi
|
|||||||
#
|
#
|
||||||
installDebianPackage ${prefix} module-init-tools
|
installDebianPackage ${prefix} module-init-tools
|
||||||
|
|
||||||
fi # if pygrub
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Log our finish
|
# Log our finish
|
||||||
|
|||||||
@@ -32,19 +32,15 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
@@ -64,7 +60,6 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|||||||
#
|
#
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
# <file system> <mount point> <type> <options> <dump> <pass>
|
||||||
proc /proc proc defaults 0 0
|
proc /proc proc defaults 0 0
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
E_O_FSTAB
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
for part in `seq 1 ${NUMPARTITIONS}`; do
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
eval "PARTITION=\"\${PARTITION${part}}\""
|
||||||
@@ -76,7 +71,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
x=$(( $x+1 ))
|
x=$(( $x+1 ))
|
||||||
done
|
done
|
||||||
IFS="${OLDIFS}"
|
IFS="${OLDIFS}"
|
||||||
|
|
||||||
case "${partdata2}" in
|
case "${partdata2}" in
|
||||||
xfs)
|
xfs)
|
||||||
has_xfs=1
|
has_xfs=1
|
||||||
@@ -85,7 +80,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
has_reiserfs=1
|
has_reiserfs=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
if [ "${partdata2}" = "swap" ]; then
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ cp /etc/resolv.conf ${prefix}/etc
|
|||||||
#
|
#
|
||||||
# Process any of the present apt-conf setup lines.
|
# Process any of the present apt-conf setup lines.
|
||||||
#
|
#
|
||||||
for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do
|
for i in /etc/apt/apt.conf /etc/apt/apt.conf.d/* ; do
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If the file exists. (Need this in case the literal glob fails.)
|
# If the file exists. (Need this in case the literal glob fails.)
|
||||||
@@ -53,8 +52,7 @@ for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do
|
|||||||
# Save the matching line(s) to the proxy guess file.
|
# Save the matching line(s) to the proxy guess file.
|
||||||
#
|
#
|
||||||
logMessage The use of a proxy detected.
|
logMessage The use of a proxy detected.
|
||||||
|
grep -i HTTP::Proxy $i >> ${prefix}/etc/apt/apt.conf.d/proxy-guess
|
||||||
grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@@ -28,9 +28,7 @@ logMessage Script $0 starting
|
|||||||
# Remove the links for upstart
|
# Remove the links for upstart
|
||||||
#
|
#
|
||||||
rm ${prefix}/etc/event.d/tty[!1]
|
rm ${prefix}/etc/event.d/tty[!1]
|
||||||
sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
|
|
||||||
mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
|
|
||||||
[ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/hvc0/ ${prefix}/etc/inittab
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Are we using an alternative serial device?
|
# Are we using an alternative serial device?
|
||||||
@@ -40,14 +38,11 @@ if [ ! -z "${serial_device}" ]; then
|
|||||||
serial_device=`basename ${serial_device}`
|
serial_device=`basename ${serial_device}`
|
||||||
|
|
||||||
# Let the user know.
|
# Let the user know.
|
||||||
logMessage "Replacing default serial device (hvc0) with ${serial_device}"
|
logMessage "Replacing default serial device (tty1) with ${serial_device}"
|
||||||
|
|
||||||
# replace existing device.
|
# replace existing device.
|
||||||
mv ${prefix}/etc/event.d/hvc0 ${prefix}/etc/event.d/${serial_device}
|
mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/${serial_device}
|
||||||
sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
|
sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/inittab
|
||||||
[ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# make sure that it is allowed to login.
|
# make sure that it is allowed to login.
|
||||||
echo $serial_device >> ${prefix}/etc/securetty
|
echo $serial_device >> ${prefix}/etc/securetty
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ setupStaticNetworking ()
|
|||||||
#
|
#
|
||||||
bcast='';
|
bcast='';
|
||||||
if [ ! -z "${broadcast}" ]; then
|
if [ ! -z "${broadcast}" ]; then
|
||||||
bcast=" broadcast ${broadcast}"
|
bcast=' broadcast ${broadcast}'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Setup the mailname + hostname files.
|
# Setup the mailname + hostname files.
|
||||||
#
|
#
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
echo ${hostname} > ${prefix}/etc/hostname
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
echo ${hostname} > ${prefix}/etc/mailname
|
||||||
|
|
||||||
|
|
||||||
@@ -88,24 +88,23 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
# and there is an installation of dnsmasq installed then
|
# and there is an installation of dnsmasq installed then
|
||||||
# reload it.
|
# reload it.
|
||||||
#
|
#
|
||||||
# This will let the local LAN clients lookup the new address.
|
# This will let the local LAN clients lookup the new address.
|
||||||
#
|
#
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
logMessage Allowing DNSMasq to restart.
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
|
||||||
fi
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ logMessage Script $0 starting
|
|||||||
# Copy "required" files from our host.
|
# Copy "required" files from our host.
|
||||||
#
|
#
|
||||||
cp /etc/timezone ${prefix}/etc
|
cp /etc/timezone ${prefix}/etc
|
||||||
cp /etc/localtime ${prefix}/etc
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If the host has sudo then copy the configuration file, and install
|
# If the host has sudo then copy the configuration file, and install
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1,112 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# If the pygrub flag is set, this script will install the necessary
|
|
||||||
# packages to boot the VM from the dom0 via pygrub. This script installs
|
|
||||||
# the kernel and modules and generates a grub menu.lst in the newly
|
|
||||||
# created maschine.
|
|
||||||
#
|
|
||||||
# Dmitry Nedospasov
|
|
||||||
# --
|
|
||||||
# http://nedos.net
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
if [ ${pygrub} ]; then
|
|
||||||
|
|
||||||
#
|
|
||||||
# Attempt to install a xen kernel, if that fails, then install a normal one
|
|
||||||
#
|
|
||||||
|
|
||||||
KERNEL_XEN_PKG="linux-image-xen"
|
|
||||||
KERNEL_PKG="linux-image-server"
|
|
||||||
|
|
||||||
logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
|
|
||||||
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
|
|
||||||
logMessage Package $KERNEL_XEN_PKG is available - installing
|
|
||||||
installDebianPackage ${prefix} initramfs-tools
|
|
||||||
installDebianPackage ${prefix} $KERNEL_XEN_PKG
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage Package $KERNEL_XEN_PKG is not available
|
|
||||||
logMessage Attempting to install the $KERNEL_PKG kernel image
|
|
||||||
logMessage WARNING: This kernel may not have pvops
|
|
||||||
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
|
|
||||||
logMessage Package $KERNEL_PKG is available - installing
|
|
||||||
installDebianPackage ${prefix} initramfs-tools
|
|
||||||
installDebianPackage ${prefix} $KERNEL_PKG
|
|
||||||
else
|
|
||||||
logMessage Package $KERNEL_PKG is not available
|
|
||||||
logMessage pygrub set, but kernel could not be installed
|
|
||||||
logMessage Script $0 failed
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
|
|
||||||
KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
|
|
||||||
DOMU_RAMDISK="initrd.img-$KERNEL_REV"
|
|
||||||
DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Generate initrd if it does not exist
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
|
|
||||||
logMessage initrd exists, skipping generation
|
|
||||||
else
|
|
||||||
logMessage initrd missing, generating
|
|
||||||
chroot ${prefix} update-initramfs -c -k $KERNEL_REV
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Generate a menu.lst for pygrub
|
|
||||||
#
|
|
||||||
|
|
||||||
mkdir -p ${prefix}/boot/grub
|
|
||||||
cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
|
|
||||||
default 0
|
|
||||||
timeout 2
|
|
||||||
|
|
||||||
title $DOMU_ISSUE
|
|
||||||
root (hd0,0)
|
|
||||||
kernel /boot/$DOMU_KERNEL root=/dev/xvda2 ro
|
|
||||||
initrd /boot/$DOMU_RAMDISK
|
|
||||||
|
|
||||||
title $DOMU_ISSUE (Single-User)
|
|
||||||
root (hd0,0)
|
|
||||||
kernel /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
|
|
||||||
initrd /boot/$DOMU_RAMDISK
|
|
||||||
|
|
||||||
E_O_MENU
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install the module-init-tools package.
|
|
||||||
#
|
|
||||||
|
|
||||||
installDebianPackage ${prefix} module-init-tools
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage pygrub not set, skipping kernel install
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -31,9 +31,7 @@ fi
|
|||||||
#
|
#
|
||||||
logMessage Script $0 starting
|
logMessage Script $0 starting
|
||||||
|
|
||||||
if [ ${pygrub} ]; then
|
|
||||||
logMessage "pygrub set, skipping module install"
|
|
||||||
else
|
|
||||||
#
|
#
|
||||||
# The name of the package containing the correct modules.
|
# The name of the package containing the correct modules.
|
||||||
#
|
#
|
||||||
@@ -73,12 +71,12 @@ else
|
|||||||
cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
|
cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Install the module-init-tools package.
|
# Install the module-init-tools package.
|
||||||
#
|
#
|
||||||
installDebianPackage ${prefix} module-init-tools
|
installDebianPackage ${prefix} module-init-tools
|
||||||
|
|
||||||
fi # if pygrub
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Log our finish
|
# Log our finish
|
||||||
|
|||||||
@@ -33,19 +33,15 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
@@ -65,7 +61,6 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|||||||
#
|
#
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
# <file system> <mount point> <type> <options> <dump> <pass>
|
||||||
proc /proc proc defaults 0 0
|
proc /proc proc defaults 0 0
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
E_O_FSTAB
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
for part in `seq 1 ${NUMPARTITIONS}`; do
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
eval "PARTITION=\"\${PARTITION${part}}\""
|
||||||
@@ -77,7 +72,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
x=$(( $x+1 ))
|
x=$(( $x+1 ))
|
||||||
done
|
done
|
||||||
IFS="${OLDIFS}"
|
IFS="${OLDIFS}"
|
||||||
|
|
||||||
case "${partdata2}" in
|
case "${partdata2}" in
|
||||||
xfs)
|
xfs)
|
||||||
has_xfs=1
|
has_xfs=1
|
||||||
@@ -86,7 +81,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
has_reiserfs=1
|
has_reiserfs=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
if [ "${partdata2}" = "swap" ]; then
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Record arch, if present.
|
|
||||||
#
|
|
||||||
if [ -d $prefix/etc/rpm ]; then
|
|
||||||
|
|
||||||
logMessage Found /etc/rpm
|
|
||||||
|
|
||||||
#
|
|
||||||
# If i386 then record this
|
|
||||||
#
|
|
||||||
if [ "$arch" = "i386" ]; then
|
|
||||||
echo "i386-fedora-linux-gnu" >> $prefix/etc/rpm/platform
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage Failed to find /etc/rpm
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Do the transformation.
|
# Do the transformation.
|
||||||
#
|
#
|
||||||
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
|
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -21,12 +21,6 @@ my $prefix = shift;
|
|||||||
die "Prefix must be given" unless defined( $prefix );
|
die "Prefix must be given" unless defined( $prefix );
|
||||||
die "Prefix must be a directory" unless ( -d $prefix );
|
die "Prefix must be a directory" unless ( -d $prefix );
|
||||||
|
|
||||||
#
|
|
||||||
# Setup /etc/shadow and /etc/gshadow (Closes: #499476)
|
|
||||||
#
|
|
||||||
system( "chroot $prefix /usr/sbin/pwconv" );
|
|
||||||
system( "chroot $prefix /usr/sbin/grpconv" );
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Exit unless the 'accounts' variable is set.
|
# Exit unless the 'accounts' variable is set.
|
||||||
|
|||||||
@@ -79,7 +79,6 @@ DEVICE=eth0
|
|||||||
BOOTPROTO=dhcp
|
BOOTPROTO=dhcp
|
||||||
ONBOOT=yes
|
ONBOOT=yes
|
||||||
E_O_DHCP
|
E_O_DHCP
|
||||||
chroot ${prefix} /usr/bin/yum -y install dhclient
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Setup the mailname + hostname files.
|
# Setup the mailname + hostname files.
|
||||||
#
|
#
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
echo ${hostname} > ${prefix}/etc/hostname
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
echo ${hostname} > ${prefix}/etc/mailname
|
||||||
|
|
||||||
|
|
||||||
@@ -89,25 +89,23 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
# and there is an installation of dnsmasq installed then
|
# and there is an installation of dnsmasq installed then
|
||||||
# reload it.
|
# reload it.
|
||||||
#
|
#
|
||||||
# This will let the local LAN clients lookup the new address.
|
# This will let the local LAN clients lookup the new address.
|
||||||
#
|
#
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
logMessage Allowing DNSMasq to restart.
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -36,19 +36,15 @@ logMessage Filesystem options are ${options}
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
@@ -68,7 +64,6 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|||||||
#
|
#
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
# <file system> <mount point> <type> <options> <dump> <pass>
|
||||||
proc /proc proc defaults 0 0
|
proc /proc proc defaults 0 0
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
E_O_FSTAB
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
for part in `seq 1 ${NUMPARTITIONS}`; do
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
eval "PARTITION=\"\${PARTITION${part}}\""
|
||||||
@@ -80,7 +75,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
x=$(( $x+1 ))
|
x=$(( $x+1 ))
|
||||||
done
|
done
|
||||||
IFS="${OLDIFS}"
|
IFS="${OLDIFS}"
|
||||||
|
|
||||||
case "${partdata2}" in
|
case "${partdata2}" in
|
||||||
xfs)
|
xfs)
|
||||||
has_xfs=1
|
has_xfs=1
|
||||||
@@ -89,7 +84,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
has_reiserfs=1
|
has_reiserfs=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
if [ "${partdata2}" = "swap" ]; then
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Do the transformation.
|
# Do the transformation.
|
||||||
#
|
#
|
||||||
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
|
sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' ${prefix}/etc/inittab
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# We need to split up the hostname into name + domain
|
# We need to split up the hostname into name + domain
|
||||||
# do this by looking for a dot.
|
# do this by looking for a dot.
|
||||||
name=$(echo "$hostname" | sed -e 's/\..*$//')
|
name=${hostname/.*/}
|
||||||
domain=$(echo "$hostname" | sed -e 's/^[^.]*\.//')
|
domain=${hostname/${name}\./}
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -96,24 +96,23 @@ if [ -z "${dhcp}" ]; then
|
|||||||
#
|
#
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
name=`echo ${hostname} | awk -F. '{print $1}'`
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
echo "${ip1} ${name} ${hostname}" >> /etc/hosts
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
# If we've updated the /etc/hosts file on the host machine
|
||||||
# and there is an installation of dnsmasq installed then
|
# and there is an installation of dnsmasq installed then
|
||||||
# reload it.
|
# reload it.
|
||||||
#
|
#
|
||||||
# This will let the local LAN clients lookup the new address.
|
# This will let the local LAN clients lookup the new address.
|
||||||
#
|
#
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
if [ -x /usr/sbin/dnsmasq ] ; then
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
if [ -e /var/run/dnsmasq.pid ]; then
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
logMessage Allowing DNSMasq to restart.
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
|
||||||
fi
|
kill -HUP `cat /var/run/dnsmasq.pid`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ logMessage Script $0 starting
|
|||||||
# If the file doesn't exist exit early.
|
# If the file doesn't exist exit early.
|
||||||
#
|
#
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
if [ ! -e ${prefix}/etc/securetty ]; then
|
||||||
logMessage /etc/securetty not found.
|
logMesage /etc/securetty not found.
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -33,19 +33,15 @@ logMessage Script $0 starting
|
|||||||
#
|
#
|
||||||
# Find the root device.
|
# Find the root device.
|
||||||
#
|
#
|
||||||
# 1. default to xvda.
|
# 1. default to sda.
|
||||||
#
|
#
|
||||||
# 2. If --ide is specified use hda.
|
# 2. If --ide is specified use hda.
|
||||||
#
|
#
|
||||||
# 3. If --scsi is specified use sda.
|
# 3. Otherwise use a named $disk_device
|
||||||
#
|
#
|
||||||
# 4. Otherwise use a named $disk_device
|
device=sda
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
if [ "${ide}" ]; then
|
||||||
device=hda
|
device=hda
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
else
|
||||||
if [ ! -z "${disk_device}" ]; then
|
if [ ! -z "${disk_device}" ]; then
|
||||||
device=`basename $disk_device`
|
device=`basename $disk_device`
|
||||||
@@ -65,7 +61,6 @@ cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|||||||
#
|
#
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
# <file system> <mount point> <type> <options> <dump> <pass>
|
||||||
proc /proc proc defaults 0 0
|
proc /proc proc defaults 0 0
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
E_O_FSTAB
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
for part in `seq 1 ${NUMPARTITIONS}`; do
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
eval "PARTITION=\"\${PARTITION${part}}\""
|
||||||
@@ -77,7 +72,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
x=$(( $x+1 ))
|
x=$(( $x+1 ))
|
||||||
done
|
done
|
||||||
IFS="${OLDIFS}"
|
IFS="${OLDIFS}"
|
||||||
|
|
||||||
case "${partdata2}" in
|
case "${partdata2}" in
|
||||||
xfs)
|
xfs)
|
||||||
has_xfs=1
|
has_xfs=1
|
||||||
@@ -86,7 +81,7 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
|
|||||||
has_reiserfs=1
|
has_reiserfs=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
if [ "${partdata2}" = "swap" ]; then
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script ensures that daemons will not be started inside our
|
|
||||||
# chroot() installation.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Make sure we have a directory.
|
|
||||||
#
|
|
||||||
if [ ! -d "${prefix}/usr/sbin" ]; then
|
|
||||||
|
|
||||||
mkdir -p "${prefix}/usr/sbin"
|
|
||||||
|
|
||||||
logMessage "created missing directory: ${prefix}/usr/sbin"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Add the script.
|
|
||||||
#
|
|
||||||
echo '#!/bin/sh' > ${prefix}/usr/sbin/policy-rc.d
|
|
||||||
echo 'exit 101' >> ${prefix}/usr/sbin/policy-rc.d
|
|
||||||
chmod 755 ${prefix}/usr/sbin/policy-rc.d
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script enforces the use of a shadow password file.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Enable the shadow passwords if the command is found.
|
|
||||||
#
|
|
||||||
if [ -x ${prefix}/sbin/shadowconfig ]; then
|
|
||||||
|
|
||||||
chroot ${prefix} /sbin/shadowconfig on
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage "/sbin/shadowconfig not found. skipping."
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script disables the hardware clock.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Disable the startup scripts from all runlevels.
|
|
||||||
#
|
|
||||||
chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script sets up the /etc/apt/sources.list for APT.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# You will probably need DNS to run "apt-get update"
|
|
||||||
#
|
|
||||||
cp /etc/resolv.conf ${prefix}/etc
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Attempt to auto-magically detect the use of a Proxy for apt-get, and
|
|
||||||
# replicate that setup in our new guest.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Process any of the present apt-conf setup lines.
|
|
||||||
#
|
|
||||||
for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# If the file exists. (Need this in case the literal glob fails.)
|
|
||||||
#
|
|
||||||
if [ -e $i ] ; then
|
|
||||||
|
|
||||||
#
|
|
||||||
# Save the matching line(s) to the proxy guess file.
|
|
||||||
#
|
|
||||||
logMessage The use of a proxy detected.
|
|
||||||
|
|
||||||
grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
cat <<E_O_APT > ${prefix}/etc/apt/sources.list
|
|
||||||
#
|
|
||||||
# /etc/apt/sources.list
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# ${dist}
|
|
||||||
#
|
|
||||||
deb ${mirror} ${dist} main restricted universe multiverse
|
|
||||||
deb-src ${mirror} ${dist} main restricted universe
|
|
||||||
deb ${mirror} ${dist}-updates main restricted universe multiverse
|
|
||||||
deb-src ${mirror} ${dist}-updates main restricted universe
|
|
||||||
deb http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
|
|
||||||
deb-src http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
|
|
||||||
|
|
||||||
E_O_APT
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Now that the sources have been setup make sure the system is up to date.
|
|
||||||
#
|
|
||||||
chroot ${prefix} /usr/bin/apt-get update
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Now fixup TLS on non-64bit systems.
|
|
||||||
#
|
|
||||||
if [ "`uname -m`" = "x86_64" ]; then
|
|
||||||
|
|
||||||
logMessage "Ignoring TLS since we're a 64 bit host."
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage "Installing libc6-xen"
|
|
||||||
installDebianPackage ${prefix} libc6-xen
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script generates a default en_US.UTF-8 locale.
|
|
||||||
#
|
|
||||||
# Ward
|
|
||||||
# --
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install the English language pack.
|
|
||||||
#
|
|
||||||
# NOTE: Failure to support your favourite language is *not* a bug.
|
|
||||||
#
|
|
||||||
installDebianPackage ${prefix} language-pack-en
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script comments out all virtual terminals which aren't on the
|
|
||||||
# first console - that must remain so that 'xm console ...' works
|
|
||||||
# correctly.
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
#
|
|
||||||
# Remove the links for upstart
|
|
||||||
#
|
|
||||||
rm ${prefix}/etc/event.d/tty[!1]
|
|
||||||
sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
|
|
||||||
mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
|
|
||||||
[ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/hvc0/ ${prefix}/etc/inittab
|
|
||||||
|
|
||||||
#
|
|
||||||
# Are we using an alternative serial device?
|
|
||||||
#
|
|
||||||
if [ ! -z "${serial_device}" ]; then
|
|
||||||
|
|
||||||
serial_device=`basename ${serial_device}`
|
|
||||||
|
|
||||||
# Let the user know.
|
|
||||||
logMessage "Replacing default serial device (hvc0) with ${serial_device}"
|
|
||||||
|
|
||||||
# replace existing device.
|
|
||||||
mv ${prefix}/etc/event.d/hvc0 ${prefix}/etc/event.d/${serial_device}
|
|
||||||
sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
|
|
||||||
[ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# make sure that it is allowed to login.
|
|
||||||
echo $serial_device >> ${prefix}/etc/securetty
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,181 +0,0 @@
|
|||||||
#!/usr/bin/perl -w
|
|
||||||
#
|
|
||||||
# This script attempts to copy all user accounts from the host to
|
|
||||||
# the guest. It does this by copying all user accounts which are not
|
|
||||||
# already present.
|
|
||||||
#
|
|
||||||
# NOTE: Unless '--accounts' was specified upon the 'xen-create-image'
|
|
||||||
# command line we don't do this.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
use strict;
|
|
||||||
use Env;
|
|
||||||
|
|
||||||
|
|
||||||
my $prefix = shift;
|
|
||||||
|
|
||||||
die "Prefix must be given" unless defined( $prefix );
|
|
||||||
die "Prefix must be a directory" unless ( -d $prefix );
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Exit unless the 'accounts' variable is set.
|
|
||||||
#
|
|
||||||
exit unless ( $ENV{'accounts'} );
|
|
||||||
|
|
||||||
#
|
|
||||||
# Make sure we have $prefix/etc
|
|
||||||
#
|
|
||||||
die "Prefix is missing /etc : $prefix" unless ( -d $prefix . "/etc" );
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Read all accounts from the installed /etc/passwd on the guest.
|
|
||||||
#
|
|
||||||
my %present;
|
|
||||||
if ( -e $prefix . "/etc/passwd" )
|
|
||||||
{
|
|
||||||
%present = readAccounts( $prefix . "/etc/passwd" );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Now read the accounts on the host.
|
|
||||||
#
|
|
||||||
my %host = readAccounts( "/etc/passwd" );
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# For each account not present on new installation then add it
|
|
||||||
#
|
|
||||||
foreach my $account ( sort keys( %host ) )
|
|
||||||
{
|
|
||||||
if ( ! $present{ $account } )
|
|
||||||
{
|
|
||||||
print "Adding: $account\n";
|
|
||||||
addAccount( $account );
|
|
||||||
|
|
||||||
#
|
|
||||||
# Find any groups the user is member of on the host
|
|
||||||
# and add them on the guest system
|
|
||||||
#
|
|
||||||
addGroups( $account );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Read the accounts which are already present on the guest image.
|
|
||||||
#
|
|
||||||
sub readAccounts
|
|
||||||
{
|
|
||||||
my ( $file ) = ( @_ );
|
|
||||||
|
|
||||||
|
|
||||||
my %found;
|
|
||||||
|
|
||||||
open( EXISTING, "<", $file );
|
|
||||||
foreach my $line ( <EXISTING> )
|
|
||||||
{
|
|
||||||
#
|
|
||||||
# Record the userid + username
|
|
||||||
#
|
|
||||||
if ( $line =~ /^([^:]+):([^:]+):([^:]+)/ )
|
|
||||||
{
|
|
||||||
my $user = $1;
|
|
||||||
my $pass = $2;
|
|
||||||
my $uid = $3;
|
|
||||||
|
|
||||||
$found{$user} = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close( EXISTING );
|
|
||||||
|
|
||||||
return( %found );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Add the passwd + shadow accounts for the given user.
|
|
||||||
#
|
|
||||||
sub addAccount
|
|
||||||
{
|
|
||||||
my ( $user ) = ( @_ );
|
|
||||||
|
|
||||||
#
|
|
||||||
# passwd file.
|
|
||||||
#
|
|
||||||
open( PASSWD, "<", "/etc/passwd" );
|
|
||||||
foreach my $line ( <PASSWD> )
|
|
||||||
{
|
|
||||||
chomp( $line );
|
|
||||||
if ( $line =~ /^\Q$user\E:/ )
|
|
||||||
{
|
|
||||||
#
|
|
||||||
# Add the line
|
|
||||||
#
|
|
||||||
open( OUTY, ">>", $prefix . "/etc/passwd" );
|
|
||||||
print OUTY $line . "\n";
|
|
||||||
close( OUTY );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close( PASSWD );
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# shadow file.
|
|
||||||
#
|
|
||||||
open( SHADOW, "<", "/etc/shadow" ) or die "Failed to open : $!";
|
|
||||||
foreach my $line ( <SHADOW> )
|
|
||||||
{
|
|
||||||
chomp( $line );
|
|
||||||
if ( $line =~ /^\Q$user\E:/ )
|
|
||||||
{
|
|
||||||
#
|
|
||||||
# Add the line
|
|
||||||
#
|
|
||||||
open( OUTY, ">>", $prefix . "/etc/shadow" );
|
|
||||||
print OUTY $line . "\n";
|
|
||||||
close( OUTY );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close( SHADOW );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Find the groups a user is member of on the host, and add them to
|
|
||||||
# those groups on the new guest.
|
|
||||||
#
|
|
||||||
sub addGroups
|
|
||||||
{
|
|
||||||
my( $username ) = ( @_ );
|
|
||||||
|
|
||||||
#
|
|
||||||
# Get the groups.
|
|
||||||
#
|
|
||||||
my $groups = `groups $username`;
|
|
||||||
# split off the usernmame.
|
|
||||||
if ( $groups =~ /^([^:]+):(.*)/ )
|
|
||||||
{
|
|
||||||
$groups = $2;
|
|
||||||
print "User: $username is member of the groups: $groups\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach my $g ( split( / /, $groups ) )
|
|
||||||
{
|
|
||||||
# Make sure the group exists.
|
|
||||||
system( "chroot $prefix /usr/sbin/addgroup $g" );
|
|
||||||
|
|
||||||
# add the user to it.
|
|
||||||
system( "chroot $prefix /usr/sbin/adduser $username $g" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,145 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script sets up the /etc/network/interface file for the new
|
|
||||||
# image.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Make sure we have an /etc/network directory.
|
|
||||||
#
|
|
||||||
mkdir -p ${prefix}/etc/network
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# A function to setup DHCP for our new image.
|
|
||||||
#
|
|
||||||
setupDynamicNetworking ()
|
|
||||||
{
|
|
||||||
#
|
|
||||||
# The host is using DHCP.
|
|
||||||
#
|
|
||||||
cat <<E_O_DHCP > ${prefix}/etc/network/interfaces
|
|
||||||
# This file describes the network interfaces available on your system
|
|
||||||
# and how to activate them. For more information, see interfaces(5).
|
|
||||||
|
|
||||||
# The loopback network interface
|
|
||||||
auto lo
|
|
||||||
iface lo inet loopback
|
|
||||||
|
|
||||||
# The primary network interface
|
|
||||||
auto eth0
|
|
||||||
iface eth0 inet dhcp
|
|
||||||
# post-up ethtool -K eth0 tx off
|
|
||||||
|
|
||||||
#
|
|
||||||
# The commented out line above will disable TCP checksumming which
|
|
||||||
# might resolve problems for some users. It is disabled by default
|
|
||||||
#
|
|
||||||
E_O_DHCP
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# A function to setup static IP addresses for our new image.
|
|
||||||
#
|
|
||||||
setupStaticNetworking ()
|
|
||||||
{
|
|
||||||
#
|
|
||||||
# broadcast address?
|
|
||||||
#
|
|
||||||
bcast='';
|
|
||||||
if [ ! -z "${broadcast}" ]; then
|
|
||||||
bcast=" broadcast ${broadcast}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# We have a static IP address
|
|
||||||
#
|
|
||||||
cat <<E_O_STATIC >${prefix}/etc/network/interfaces
|
|
||||||
# This file describes the network interfaces available on your system
|
|
||||||
# and how to activate them. For more information, see interfaces(5).
|
|
||||||
|
|
||||||
# The loopback network interface
|
|
||||||
auto lo
|
|
||||||
iface lo inet loopback
|
|
||||||
|
|
||||||
# The primary network interface
|
|
||||||
auto eth0
|
|
||||||
iface eth0 inet static
|
|
||||||
address ${ip1}
|
|
||||||
gateway ${gateway}
|
|
||||||
netmask ${netmask}
|
|
||||||
${bcast}
|
|
||||||
# post-up ethtool -K eth0 tx off
|
|
||||||
|
|
||||||
#
|
|
||||||
# The commented out line above will disable TCP checksumming which
|
|
||||||
# might resolve problems for some users. It is disabled by default
|
|
||||||
#
|
|
||||||
E_O_STATIC
|
|
||||||
|
|
||||||
interface=1
|
|
||||||
count=2
|
|
||||||
|
|
||||||
while [ "${count}" -le "${ip_count}" ]; do
|
|
||||||
|
|
||||||
value=\$ip${count}
|
|
||||||
value=`eval echo $value`
|
|
||||||
|
|
||||||
logMessage Adding etho:${interface}
|
|
||||||
|
|
||||||
cat <<E_O_STATIC >>${prefix}/etc/network/interfaces
|
|
||||||
auto eth0:${interface}
|
|
||||||
iface eth0:${interface} inet static
|
|
||||||
address ${value}
|
|
||||||
netmask ${netmask}
|
|
||||||
# post-up ethtool -K eth0 tx off
|
|
||||||
E_O_STATIC
|
|
||||||
count=`expr $count + 1`
|
|
||||||
interface=`expr $interface + 1`
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Call the relevant function
|
|
||||||
#
|
|
||||||
if [ -z "${dhcp}" ]; then
|
|
||||||
logMessage "Setting up static networking"
|
|
||||||
setupStaticNetworking
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage "Setting up DHCP networking"
|
|
||||||
setupDynamicNetworking
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script places the new systems hostname into a couple of files within
|
|
||||||
# the new image.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Setup the mailname + hostname files.
|
|
||||||
#
|
|
||||||
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
|
|
||||||
echo ${hostname} > ${prefix}/etc/mailname
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Fixup the /etc/hosts file upon the new image for
|
|
||||||
# machines with static IPs
|
|
||||||
#
|
|
||||||
if [ -z "${dhcp}" ]; then
|
|
||||||
|
|
||||||
# Non-IPv6 stuff.
|
|
||||||
grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
|
|
||||||
|
|
||||||
# New entry.
|
|
||||||
echo "${ip1} ${hostname}" >> ${prefix}/etc/hosts
|
|
||||||
echo " " >> ${prefix}/etc/hosts
|
|
||||||
|
|
||||||
# IPv6 stuff.
|
|
||||||
grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
#
|
|
||||||
# Stub /etc/hosts for DHCP clients.
|
|
||||||
#
|
|
||||||
cat >> ${prefix}/etc/hosts <<EOF
|
|
||||||
127.0.0.1 localhost
|
|
||||||
|
|
||||||
# The following lines are desirable for IPv6 capable hosts
|
|
||||||
::1 ip6-localhost ip6-loopback
|
|
||||||
fe00::0 ip6-localnet
|
|
||||||
ff00::0 ip6-mcastprefix
|
|
||||||
ff02::1 ip6-allnodes
|
|
||||||
ff02::2 ip6-allrouters
|
|
||||||
ff02::3 ip6-allhosts
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Allow the host system to know the IP address of our new guest.
|
|
||||||
#
|
|
||||||
if [ -z "${dhcp}" ]; then
|
|
||||||
|
|
||||||
if ( grep ${hostname} /etc/hosts > /dev/null ) ; then
|
|
||||||
|
|
||||||
logMessage Host already has IP address for the host ${hostname}.
|
|
||||||
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# Short host name.
|
|
||||||
#
|
|
||||||
name=`echo ${hostname} | awk -F. '{print $1}'`
|
|
||||||
|
|
||||||
if [ -z "${nohosts}" ]; then
|
|
||||||
|
|
||||||
logMessage Adding ${hostname} and ${name} to /etc/hosts on the host
|
|
||||||
echo "${ip1} ${hostname} ${name}" >> /etc/hosts
|
|
||||||
|
|
||||||
#
|
|
||||||
# If we've updated the /etc/hosts file on the host machine
|
|
||||||
# and there is an installation of dnsmasq installed then
|
|
||||||
# reload it.
|
|
||||||
#
|
|
||||||
# This will let the local LAN clients lookup the new address.
|
|
||||||
#
|
|
||||||
if [ -x /usr/sbin/dnsmasq ] ; then
|
|
||||||
if [ -e /var/run/dnsmasq.pid ]; then
|
|
||||||
|
|
||||||
logMessage Allowing DNSMasq to restart.
|
|
||||||
kill -s HUP `cat /var/run/dnsmasq.pid`
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copy files from a 'skel' directory, if present, into the
|
|
||||||
# new images
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copy "required" files from our host.
|
|
||||||
#
|
|
||||||
cp /etc/timezone ${prefix}/etc
|
|
||||||
cp /etc/localtime ${prefix}/etc
|
|
||||||
|
|
||||||
#
|
|
||||||
# If the host has sudo then copy the configuration file, and install
|
|
||||||
# the package
|
|
||||||
#
|
|
||||||
if [ -e /etc/sudoers ]; then
|
|
||||||
|
|
||||||
logMessage Installing SUDO too.
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copy file and fixup permissions.
|
|
||||||
#
|
|
||||||
cp /etc/sudoers ${prefix}/etc
|
|
||||||
chown root:root ${prefix}/etc/sudoers
|
|
||||||
chmod 440 ${prefix}/etc/sudoers
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install sudo
|
|
||||||
#
|
|
||||||
installDebianPackage ${prefix} sudo
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copy files from a 'skel' directory, if present, into the
|
|
||||||
# new images
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copy everything from the skel directory into the new instance
|
|
||||||
# if that directory exists.
|
|
||||||
#
|
|
||||||
if [ -d /etc/xen-tools/skel ]; then
|
|
||||||
|
|
||||||
logMessage Copying files from /etc/xen-tools/skel
|
|
||||||
|
|
||||||
(cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${prefix}/; tar -xpf -)
|
|
||||||
|
|
||||||
logMessage Finished
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage skel directory, /etc/xen-tools/skell, not present ignoring.
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script installs OpenSSH upon the new system.
|
|
||||||
#
|
|
||||||
# It must make sure that the server is not running before it exits
|
|
||||||
# otherwise the temporary mounted directory will not be unmountable.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install ssh
|
|
||||||
#
|
|
||||||
installDebianPackage ${prefix} ssh
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script ensures /etc/securetty upon the new guests has the new
|
|
||||||
# Xen console devices in it
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
#
|
|
||||||
# If the file doesn't exist exit early.
|
|
||||||
#
|
|
||||||
if [ ! -e ${prefix}/etc/securetty ]; then
|
|
||||||
logMessage /etc/securetty not found.
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Do both the devices.
|
|
||||||
#
|
|
||||||
for i in xvc0 hvc0 ; do
|
|
||||||
|
|
||||||
#
|
|
||||||
# Only append if not presnt.
|
|
||||||
#
|
|
||||||
if ( grep $i ${prefix}/etc/securetty > /dev/null ) ; then
|
|
||||||
|
|
||||||
logMessage Host already has $i entry
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
echo $i >> ${prefix}/etc/securetty
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# If the pygrub flag is set, this script will install the necessary
|
|
||||||
# packages to boot the VM from the dom0 via pygrub. This script installs
|
|
||||||
# the kernel and modules and generates a grub menu.lst in the newly
|
|
||||||
# created maschine.
|
|
||||||
#
|
|
||||||
# Dmitry Nedospasov
|
|
||||||
# --
|
|
||||||
# http://nedos.net
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
if [ ${pygrub} ]; then
|
|
||||||
|
|
||||||
#
|
|
||||||
# Attempt to install a xen kernel, if that fails, then install a normal one
|
|
||||||
#
|
|
||||||
|
|
||||||
KERNEL_PKG="linux-image-server"
|
|
||||||
|
|
||||||
logMessage Attempting to install the $KERNEL_PKG kernel image
|
|
||||||
logMessage WARNING: This kernel may not have pvops
|
|
||||||
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
|
|
||||||
logMessage Package $KERNEL_PKG is available - installing
|
|
||||||
installDebianPackage ${prefix} initramfs-tools
|
|
||||||
installDebianPackage ${prefix} $KERNEL_PKG
|
|
||||||
else
|
|
||||||
logMessage Package $KERNEL_PKG is not available
|
|
||||||
logMessage pygrub set, but kernel could not be installed
|
|
||||||
logMessage Script $0 failed
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
|
|
||||||
KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
|
|
||||||
DOMU_RAMDISK="initrd.img-$KERNEL_REV"
|
|
||||||
DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Generate initrd if it does not exist
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
|
|
||||||
logMessage initrd exists, skipping generation
|
|
||||||
else
|
|
||||||
logMessage initrd missing, generating
|
|
||||||
chroot ${prefix} update-initramfs -c -k $KERNEL_REV
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Generate a menu.lst for pygrub
|
|
||||||
#
|
|
||||||
|
|
||||||
mkdir -p ${prefix}/boot/grub
|
|
||||||
cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
|
|
||||||
default 0
|
|
||||||
timeout 2
|
|
||||||
|
|
||||||
title $DOMU_ISSUE
|
|
||||||
root (hd0,0)
|
|
||||||
kernel /boot/$DOMU_KERNEL root=/dev/xvda2 ro
|
|
||||||
initrd /boot/$DOMU_RAMDISK
|
|
||||||
|
|
||||||
title $DOMU_ISSUE (Single-User)
|
|
||||||
root (hd0,0)
|
|
||||||
kernel /boot/$DOMU_KERNEL root=/dev/xvda2 ro single
|
|
||||||
initrd /boot/$DOMU_RAMDISK
|
|
||||||
|
|
||||||
E_O_MENU
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install the module-init-tools package.
|
|
||||||
#
|
|
||||||
|
|
||||||
installDebianPackage ${prefix} module-init-tools
|
|
||||||
|
|
||||||
else
|
|
||||||
logMessage pygrub not set, skipping kernel install
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Install modules from the host system into the new image, and
|
|
||||||
# ensure that 'module-init-tools' is setup.
|
|
||||||
#
|
|
||||||
# This is most likely required if you're using a custom kernel
|
|
||||||
# for your Xen system. But even if it isn't required it can't
|
|
||||||
# really do anything bad; just waste a bit of space.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
if [ ${pygrub} ]; then
|
|
||||||
logMessage "pygrub set, skipping module install"
|
|
||||||
else
|
|
||||||
#
|
|
||||||
# The name of the package containing the correct modules.
|
|
||||||
#
|
|
||||||
linux_modules_package="linux-modules-$(uname -r)"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Attempt to install that package. This will either work on an Etch
|
|
||||||
# system, or fail on a Sarge/custom kernel.
|
|
||||||
#
|
|
||||||
if [ -n "${modules}" -a -d "${modules}" ]; then
|
|
||||||
|
|
||||||
#
|
|
||||||
# Modules path was specified during install
|
|
||||||
#
|
|
||||||
logMessage "Copying modules from ${modules}"
|
|
||||||
|
|
||||||
mkdir -p ${prefix}/lib/modules
|
|
||||||
cp -au ${modules} ${prefix}/lib/modules
|
|
||||||
elif chroot ${prefix} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then
|
|
||||||
|
|
||||||
logMessage "Package '${linux_modules_package}' is available - installing"
|
|
||||||
|
|
||||||
#
|
|
||||||
# If it worked then we can install the package.
|
|
||||||
#
|
|
||||||
installDebianPackage ${prefix} ${linux_modules_package}
|
|
||||||
else
|
|
||||||
|
|
||||||
#
|
|
||||||
# Fall back to copying over modules from the host to the new
|
|
||||||
# system.
|
|
||||||
#
|
|
||||||
logMessage "Package '${linux_modules_package}' is not available"
|
|
||||||
logMessage "Copying modules from /lib/modules/$(uname -r)"
|
|
||||||
|
|
||||||
mkdir -p ${prefix}/lib/modules
|
|
||||||
cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Install the module-init-tools package.
|
|
||||||
#
|
|
||||||
installDebianPackage ${prefix} module-init-tools
|
|
||||||
|
|
||||||
fi # if pygrub
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script is responsible for setting up /etc/fstab upon the
|
|
||||||
# new instance.
|
|
||||||
#
|
|
||||||
# This should be a simple job, but it is complicated by some of the
|
|
||||||
# differences between filesystems - some root filesystems will require
|
|
||||||
# the installation of new packages, and we have to handle that here.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Find the root device.
|
|
||||||
#
|
|
||||||
# 1. default to xvda.
|
|
||||||
#
|
|
||||||
# 2. If --ide is specified use hda.
|
|
||||||
#
|
|
||||||
# 3. If --scsi is specified use sda.
|
|
||||||
#
|
|
||||||
# 4. Otherwise use a named $disk_device
|
|
||||||
#
|
|
||||||
device=xvda
|
|
||||||
if [ "${ide}" ]; then
|
|
||||||
device=hda
|
|
||||||
elif [ "${scsi}" ]; then
|
|
||||||
device=sda
|
|
||||||
else
|
|
||||||
if [ ! -z "${disk_device}" ]; then
|
|
||||||
device=`basename $disk_device`
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
logMessage "Root device is /dev/$device"
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Now we have the options we can create the fstab.
|
|
||||||
#
|
|
||||||
has_xfs=0
|
|
||||||
has_reiserfs=0
|
|
||||||
cat <<E_O_FSTAB > ${prefix}/etc/fstab
|
|
||||||
# /etc/fstab: static file system information.
|
|
||||||
#
|
|
||||||
# <file system> <mount point> <type> <options> <dump> <pass>
|
|
||||||
proc /proc proc defaults 0 0
|
|
||||||
devpts /dev/pts devpts rw,noexec,nosuid,gid=5,mode=620 0 0
|
|
||||||
E_O_FSTAB
|
|
||||||
for part in `seq 1 ${NUMPARTITIONS}`; do
|
|
||||||
eval "PARTITION=\"\${PARTITION${part}}\""
|
|
||||||
OLDIFS="${IFS}"
|
|
||||||
IFS=:
|
|
||||||
x=0
|
|
||||||
for partdata in ${PARTITION}; do
|
|
||||||
eval "partdata${x}=\"${partdata}\""
|
|
||||||
x=$(( $x+1 ))
|
|
||||||
done
|
|
||||||
IFS="${OLDIFS}"
|
|
||||||
|
|
||||||
case "${partdata2}" in
|
|
||||||
xfs)
|
|
||||||
has_xfs=1
|
|
||||||
;;
|
|
||||||
reiserfs)
|
|
||||||
has_reiserfs=1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "${partdata2}" = "swap" ]; then
|
|
||||||
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab
|
|
||||||
else
|
|
||||||
echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Finally we can install any required packages for the given root
|
|
||||||
# filesystem
|
|
||||||
#
|
|
||||||
if [ $has_xfs -eq 1 ]; then
|
|
||||||
installDebianPackage ${prefix} xfsprogs
|
|
||||||
fi
|
|
||||||
if [ $has_reiserfs -eq 1 ]; then
|
|
||||||
installDebianPackage ${prefix} reiserfsprogs
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script cleans the newly created image's apt-get archive.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Clean the APT package cache for Debian GNU/Linux.
|
|
||||||
#
|
|
||||||
chroot ${prefix} /usr/bin/apt-get clean
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script removes the file which prevents daemons from running.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Remove the script if present.
|
|
||||||
#
|
|
||||||
if [ -x "${prefix}/usr/sbin/policy-rc.d" ]; then
|
|
||||||
|
|
||||||
rm -f "${prefix}/usr/sbin/policy-rc.d"
|
|
||||||
|
|
||||||
logMessage "Removed: ${prefix}/usr/sbin/policy-rc.d"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script ensures that daemons will not be started inside our
|
|
||||||
# chroot() installation.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Make sure we have a directory.
|
|
||||||
#
|
|
||||||
if [ ! -d "${prefix}/usr/sbin" ]; then
|
|
||||||
|
|
||||||
mkdir -p "${prefix}/usr/sbin"
|
|
||||||
|
|
||||||
logMessage "created missing directory: ${prefix}/usr/sbin"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Add the script.
|
|
||||||
#
|
|
||||||
echo '#!/bin/sh' > ${prefix}/usr/sbin/policy-rc.d
|
|
||||||
echo 'exit 101' >> ${prefix}/usr/sbin/policy-rc.d
|
|
||||||
chmod 755 ${prefix}/usr/sbin/policy-rc.d
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script enforces the use of a shadow password file.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Enable the shadow passwords if the command is found.
|
|
||||||
#
|
|
||||||
if [ -x ${prefix}/sbin/shadowconfig ]; then
|
|
||||||
|
|
||||||
chroot ${prefix} /sbin/shadowconfig on
|
|
||||||
else
|
|
||||||
|
|
||||||
logMessage "/sbin/shadowconfig not found. skipping."
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script disables the hardware clock.
|
|
||||||
#
|
|
||||||
# Steve
|
|
||||||
# --
|
|
||||||
# http://www.steve.org.uk/
|
|
||||||
|
|
||||||
|
|
||||||
prefix=$1
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Source our common functions
|
|
||||||
#
|
|
||||||
if [ -e /usr/lib/xen-tools/common.sh ]; then
|
|
||||||
. /usr/lib/xen-tools/common.sh
|
|
||||||
else
|
|
||||||
. ./hooks/common.sh
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our start
|
|
||||||
#
|
|
||||||
logMessage Script $0 starting
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Disable the startup scripts from all runlevels.
|
|
||||||
#
|
|
||||||
chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
|
|
||||||
|
|
||||||
#
|
|
||||||
# Log our finish
|
|
||||||
#
|
|
||||||
logMessage Script $0 finished.
|
|
||||||
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user