Change all occurrences of $prefix in hooks and roles with $TARGET

"target" is also the name used in the debian installer for the
installation target while "prefix" is too ambiguous.

.gitignore

@@ -6,7 +6,6 @@
 # but we _wan't_ those dot-files
 !.gitignore
 !.mailmap
-!.travis.yml
 
 # ChangeLog is generated during make
 /ChangeLog
@@ -15,12 +14,10 @@
 /build-stamp
 /configure-stamp
 /man
-/debian/*-stamp
 /debian/files
 /debian/xen-tools
 /debian/xen-tools.debhelper.log
 /debian/xen-tools.substvars
-/debian/xen-tools.*.debhelper
 
 # git-generated patches
 /*.patch

.travis.yml

@@ -1,42 +0,0 @@
-language: perl
-perl:
-  - "5.32"
-  - "5.30"
-  - "5.28"
-  - "5.26"
-  - "5.24"
-  - "5.22"
-  - "5.20"
-  - "5.18"
-  - "5.16"
-  - "5.14"
-  - "5.12"
-  - "5.10"
-  - "dev"
-  - "blead"
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - perl: blead
-
-before_install:
-   - sudo apt-get update
-   - sudo apt-get install devscripts dpkg-dev lsb-release
-   - eval $(curl https://travis-perl.github.io/init)
-   - build-perl
-   - perl -V
-
-install:
-   - yes '' | cpanm --verbose --notest --skip-satisfied Data::Validate::Domain Data::Validate::IP Data::Validate::URI File::Slurp File::Which Log::Message Term::UI Test::NoTabs Test::Pod::Coverage Test::Pod Text::Template Devel::Cover::Report::Coveralls Sort::Versions Test::File::Contents
-   - export RELEASE_TESTING=1 AUTOMATED_TESTING=1 AUTHOR_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1 PATH=bin:${PERLBREW_PATH}:${PATH}
-
-script:
-   - make test-verbose
-
-after_success:
-   - prove --exec 'env PERL5OPT=-MDevel::Cover=-ignore_re,^(t/|/usr) perl' t/*.t
-   - cover -ignore_re '^(t/|/usr)' -report coveralls
-
-notifications:
-  irc: "irc.lugs.ch#kivamon"

AUTHORS

@@ -34,15 +34,9 @@ Contributions
   Vagrant Cascadian <vagrant [at] org.debian>
    - Less redundant SSH key generation
 
-  Adrian C. (anrxc) <anrxc [at] org.sysphere>
-  - Hook overrides
-
   Edd Dumbill <edd [at] com.usefulinc>
    - Contributed APT sources.list file for Ubuntu's Dapper release.
 
-  Lionel FÉLICITÉ <lfelicite [at] com clever-age>
-   - Bugfix for Centos 6 installation
-
   Kevin Fullerton <kevin.fullerton [at] uk.co.shotgun-suicide>
    - Fixup for gentoos revised networking scripts.  (dhcp)
 
@@ -65,15 +59,12 @@ Contributions
    - Added hook for automatic CFEngine installation.
 
   Sascha Kettler <kettler [at] net.gmx>
-   - Implemented support for arbitrary partitioning schemes.
+   - Implemented support for arbitary partitioning schemes.
 
   Eric Lemoine <eric.lemoine [at] com.gmail>
    - Improved binary detection and good suggestions.
    - Better portability for non-bash shells.
 
-  Daniel Lintott <daniel [at] uk.co.serverb>
-   - Bugfix for Jessie and newer installations
-
   Jorge Armando Medina <jmedina [at] com.e-compugraf>
    - Fix for backward compatibility with xvc0 serial consoles
 
@@ -106,9 +97,6 @@ Contributions
    - CentOS 6 support
    - CentOS 5 fixes
 
-  Patryk Ściborek <patryk [at] com.sciborek>
-   - Ubuntu-related bugfix
-
   Radu Spineanu <radu [at] org.debian>
    - Supplied many small tweaks, bugfixes, and suggestions.
    - Radu is also one of the former Debian package maintainers.
@@ -128,12 +116,5 @@ Contributions
   Ward Vandewege <ward [at] be.pong>
    - Made several updates for Ubuntu support.
 
-  Santiago Vila <sanvila [at] es.unex>
-   - Found and fixed a bunch of typos and formatting issues.
-
-  Joan <aseques [at] com.gmail>
-   - Bugfix for password interaction
-   - maxmem option
-
   xstasi on Launchpad
    - Proper upstart handling in the chroot

BUGS.markdown

@@ -0,0 +1,23 @@
+Reporting Bugs
+==============
+
+To report a bug please use the [xen-tools-discuss* mailing
+list](http://xen-tools.org/software/xen-tools/lists.html).
+
+If you're capable of fixing it yourself a patch is appreciated, and a
+test case would be a useful bonus.
+
+
+Known Bugs
+==========
+
+The Debian bug tracker contains a [list of all currently open
+issues](http://bugs.debian.org/xen-tools) which have been reported by
+the users of the Debian package (the primary user-base).
+
+If you're running the code on a Debian host system then reporting bugs
+against this package is a good thing to do; by doing so you allow
+others to view issues, and I check the bug-page regularly.
+
+-- 
+The Xen-Tools Developer Team

KNOWN_BUGS.markdown

@@ -0,0 +1,43 @@
+KNOWN BUGS in xen-tools
+=======================
+
+Bugs to fix before next release
+-------------------------------
+
+[None so far]
+
+Bugs to fix rather soon
+-----------------------
+
+* `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.
+
+   [Bug Report](http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html)
+
+* partitions were mounted in config file order, not in mountpoint order.
+  That implies that if you specified :
+
+    /boot
+    /
+
+  in that order, `/` was mounted _over_ `/boot`, and you would not
+  _see_ `/boot`.  Xen-Tools would then install `boot` on your `/`
+  partition, and your boot device was just empty and unbootable.
+
+  Workaround for 4.2 is to write your partition file such as mounts overlap
+  correctly when mounted in specified order.
+
+  Current (unreleased) fix is to sort by mountpoint length.
+
+  Fix would be to reproduce what mount does with mount `-a`.
+
+
+Bugs to fix later
+-----------------
+
+`t/xen-tools.t` can't really test Xen::Tools as the latter requires a
+local Xen installation. For proper testing, a dummy set of Xen
+configuration files and configurable paths to them in `Xen::Tools`
+would be necessary.

LICENSE

@@ -19,7 +19,7 @@ The text of both of these licenses follows below.
 
 Steve
 --
-https://steve.fi/
+http://www.steve.org.uk/
 
 
 

Makefile

@@ -6,15 +6,15 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 #
 
 #
 #  Only used to build distribution tarballs.
 #
-TMPDIR     ?= /tmp
+TMP        ?= /tmp
-DIST_PREFIX = ${TMPDIR}
+DIST_PREFIX = ${TMP}
-VERSION     = 4.9
+VERSION     = 4.4~dev
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git
@@ -34,9 +34,7 @@ nop:
 	@echo " diff          = See local changes."
 	@echo " install       = Install the software"
 	@echo " manpages      = Make manpages beneath man/"
-	@echo " tarball       = Make a release tarball"
+	@echo " release       = Make a release tarball"
-	@echo " orig-tar-gz   = Make a tarball suitably named for Debian"
-	@echo " release       = Make a release tarball and sign it"
 	@echo " uninstall     = Remove the software"
 	@echo " update        = Update from the source repository."
 	@echo " "
@@ -69,7 +67,6 @@ clean:
 	@if [ -e build-stamp ]; then rm -f build-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 cover_db ]; then rm -rf ./cover_db; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz ]; then rm $(BASE)-$(VERSION).tar.gz ; fi
 	@if [ -e $(BASE)-$(VERSION).tar.gz.asc ]; then rm $(BASE)-$(VERSION).tar.gz.asc ; fi
 	cd t; $(MAKE) clean
@@ -95,7 +92,7 @@ diff:
 fixup-perms:
 	for i in hooks/*/*-*; do chmod 755 $$i; done
 	chmod 755 hooks/common.sh
-	chmod 644 etc/*.conf
+	chmod 644 etc/xen-tools.conf
 	chmod 644 etc/xm.tmpl
 	chmod 644 etc/xm-nfs.tmpl
 	chmod 644 misc/*
@@ -109,12 +106,12 @@ install-etc:
 	-mkdir -p ${prefix}/etc/xen-tools/skel/
 	-mkdir -p ${prefix}/etc/xen-tools/role.d/
 	-mkdir -p ${prefix}/etc/xen-tools/partitions.d/
-	cp etc/*.conf         ${prefix}/etc/xen-tools/
+	cp etc/xen-tools.conf ${prefix}/etc/xen-tools/
 	cp etc/xm.tmpl        ${prefix}/etc/xen-tools/
 	cp etc/xm-nfs.tmpl    ${prefix}/etc/xen-tools/
 	cp partitions/*-*     ${prefix}/etc/xen-tools/partitions.d/
-	-mkdir -p                         ${prefix}/usr/share/bash-completion/completions/
+	-mkdir -p                         ${prefix}/etc/bash_completion.d/
-	cp misc/xen-tools.bash-completion ${prefix}/usr/share/bash-completion/completions/xen-tools
+	cp misc/xen-tools.bash-completion ${prefix}/etc/bash_completion.d/xen-tools
 	-mkdir -p                         ${prefix}/etc/initramfs-tools/conf.d/
 	cp misc/xen-tools.initramfs-tools ${prefix}/etc/initramfs-tools/conf.d/xen-tools
 
@@ -132,7 +129,6 @@ install-bin:
 	cp bin/xen-delete-image     ${prefix}/usr/bin
 	cp bin/xen-list-images      ${prefix}/usr/bin
 	cp bin/xen-update-image     ${prefix}/usr/bin
-	cp bin/xen-resize-guest     ${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-nfs
@@ -181,17 +177,9 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d squeeze.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d wheezy.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d jessie.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stretch.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d buster.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bullseye.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d bookworm.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d trixie.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d unstable.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d oldstable.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d oldoldstable.d
 	mkdir -p ${prefix}/usr/share/xen-tools/gentoo.d/
 	cp -R hooks/gentoo/*-* ${prefix}/usr/share/xen-tools/gentoo.d
 	mkdir -p ${prefix}/usr/share/xen-tools/dapper.d/
@@ -213,24 +201,6 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d saucy.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d trusty.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d utopic.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d vivid.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d wily.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d xenial.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d yakkety.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d zesty.d
-	mkdir -p ${prefix}/usr/share/xen-tools/artful.d/
-	cp -R hooks/artful/*-* ${prefix}/usr/share/xen-tools/artful.d/
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d bionic.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d cosmic.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d disco.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d eoan.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d focal.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d groovy.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d hirsute.d
-	-cd ${prefix}/usr/share/xen-tools/ && ln -s artful.d devel.d
 	cp hooks/common.sh ${prefix}/usr/share/xen-tools
 	cp -r hooks/common ${prefix}/usr/share/xen-tools
 
@@ -268,41 +238,39 @@ manpages:
 #
 #  Make a new release tarball, and make a GPG signature.
 #
-release: orig-tar-gz
+release: tidy fixup-perms update-version update-modules clean changelog
-	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
-	git tag -s -m "Release as $(VERSION)" "release-$(VERSION)"
-
-tarball: test tidy fixup-perms update-version update-modules clean changelog
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -f $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz
 	cp -R . $(DIST_PREFIX)/$(BASE)-$(VERSION)
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/debian
-	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/cover_db
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)/.git*
 	cd $(DIST_PREFIX) && tar -cvf $(DIST_PREFIX)/$(BASE)-$(VERSION).tar $(BASE)-$(VERSION)/
-	gzip -9nv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
+	gzip $(DIST_PREFIX)/$(BASE)-$(VERSION).tar
 	mv $(DIST_PREFIX)/$(BASE)-$(VERSION).tar.gz ..
 	rm -rf $(DIST_PREFIX)/$(BASE)-$(VERSION)
+	gpg --armour --detach-sign ../$(BASE)-$(VERSION).tar.gz
 
 #
 #  Make a new orig.tar.gz for the Debian package
 #
-orig-tar-gz: tarball
+orig-tar-gz: release
 	cp -p ../$(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
+	cp -p ../$(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
 
 
 #
 #  Run the test suite.
 #
-test-verbose : VERBOSE = -v
+test: update-modules
-test-verbose: test
+	prove --shuffle t/
-test: non-author-test author-test
 
-non-author-test: update-modules
-	prove $(VERBOSE) --shuffle t/
 
-author-test:
+#
-	prove $(VERBOSE) xt/
+#  Run the test suite verbosely.
+#
+test-verbose:
+	prove --shuffle --verbose t/
+
 
 
 #
@@ -330,8 +298,6 @@ uninstall:
 	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/distributions.conf
-	rm -f ${prefix}/etc/xen-tools/mirrors.conf
 	rm -f ${prefix}/etc/xen-tools/xm.tmpl
 	-rm -rf ${prefix}/etc/xen-tools/skel
 	-rmdir ${prefix}/etc/xen-tools/

NEWS.markdown

@@ -1,437 +1,3 @@
-xen-tools 4.9 (released 29 Dec 2020)
-====================================
-
-New Features
-------------
-
-* Add Debian install rules for arm64. (GH #62; PR by Ian McLinden
-  @ianmclinden)
-* Add netplan p2p support for Ubuntu. (GH #58; PR by Volker Janzen
-  @frootmig)
-
-Bug Fixes
----------
-
-* Fix typo in release name of the future Debian 12 release.
-* Makefile: Actually install xen-resize-guest tool. (Thanks to
-  Debian's Lintian tool reporting that there is a man-page without
-  binary installed!)
-* Distinguish between those Debian releases using `$dist/updates` for
-  security updates and those who use `$dist-security`. Thanks to Paul
-  Wise for the bug report. (Closes Debian bug report #972749.)
-* Fix support for `lvm_thin`. Thanks to Andreas Sundstrom for the bug
-  report and patch! (Closes Debian bug report #942244.)
-* Mount `/proc` and `/dev` before calling update-grub. Thanks to
-  Brandon Bradley for the bug report and patch. (Closes Debian bug
-  report #815021.)
-* Fix storage commandline options not overriding `xen-tools.conf`
-  settings also in `xen-update-image` and `xen-delete-image`. (GH #57;
-  patch by Volker Janzen @frootmig)
-
-Distribution Releases Changes
------------------------------
-
-* Support for
-  + Ubuntu 19.10 Eoan Ermine (EoL)
-  + Ubuntu 20.04 Focal Fossa (LTS)
-  + Ubuntu 20.10 Groovy Gorilla
-* Preliminary support for
-  + Debian 13 Trixie
-  + Ubuntu 21.04 Hirsute Hippo
-* Declare the following releases as EoL:
-  + Ubuntu 17.10 Artful Aardvark (Was missing in previous release
-    despite mentioned in this file.)
-  + Ubuntu 18.10 Cosmic Cuttlefish
-  + Ubuntu 19.04 Disco Dingo
-  + Debian 7 Wheezy
-  + Debian 8 Jessie
-* Start all Debian releases since Stretch (9) with pygrub by default.
-
-Other Changes
--------------
-
-* Support running tests verbosely with Make target "test-verbose".
-* Drop "dont-test" flag from bullseye.
-* partitions/sample-server: Change options=sync to
-  options=defaults. (GL MR !1; patch by Wolfgang Karall)
-
-
-xen-tools 4.8 (released 9 Feb 2019)
-===================================
-
-New Features
-------------
-
-* Support for ZFS volumes (by Marc Bigler, GH #50)
-* Support for LVM thin provisioning (by Nico Boehr, GH #47)
-* Support for really random MAC addresses upon every `xen-create-image`
-  invocation by using the new option `--randommac`. (by Pietro Stäheli,
-  closes Debian bug report #855703)
-* `distributions.conf` now supports arbitrary keyring files in
-   `/usr/share/keyrings/`. (Needed for some EoL Ubuntu releases.)
-* Support for netplan.io network configuration as used in recent
-  Ubuntu releases. (Hook by Arno and Peter, GH #51)
-
-Bug Fixes
----------
-
-* Minor documentation fixes.
-* Eliminate progress reporting which is useless in logs. (Yuri Sakhno,
-  GH #42)
-* Drop `pygrub` path detection from `xm.tmpl`, Xen prefers a path-less
-  `bootloader='pygrub'`.
-
-Distribution Releases Changes
------------------------------
-
-* Support for
-  + Ubuntu 17.10 Artful Aardvark
-  + Ubuntu 18.04 Bionic Beaver (LTS) (GH #51)
-  + Ubuntu 18.10 Cosmic Cuttlefish
-* Preliminary support for Ubuntu 19.04 Disco Dingo
-* Knows about code name for Debian 12 (Bookworm).
-* Considers Ubuntu Yakkety, Zesty and Artful being EoL.
-* Set Ubuntu fallback suite to the latest LTS, i.e. 18.04 Bionic.
-
-Other Changes
--------------
-
-* Change all occurrences of `httpredir.debian.org` to
-  `deb.debian.org` except those for the `debian-archive`. The latter
-  now point to `archive.debian.org` directly.
-* Many improvements for the `release-testing` script.
-* Only run `xen-toolstack` helper script if both, `xm` and `xl` are
-  present. Avoids warning about deprecated helper script.
-
-
-xen-tools 4.7 (released 23 Jan 2017)
-====================================
-
-New Features
-------------
-
-New keywords in distributions.conf: default-keyring, dont-test
-
-* Support situations where distributions (e.g. Squeeze) might be end
-  of life, but its archive signing key is still not removed from the
-  default keyring. (As of this writing, that's the case for Debian 6
-  Squeeze on Debian 8 Jessie.)
-
-Bug Fixes
----------
-
-* Fixes reported error code in case of subcommand failure (Reported
-  and fixed by Yuri Sakhno, thanks!)
-* Fixes inconsistent/non-functional handling of --nopygrub parameter.
-  Thanks Daniel Reichelt for the bug report and patch! (Closes
-  Debian bug report #842609)
-* Fixes possible missing gateway in generated /etc/network/interfaces.
-  Thanks Santiago Vila for the bug report and patch! (Closes Debian
-  bug report #764625)
-* Fixes typo found by Lintian.
-* Work around LVM related race condition when using --force with LVM:
-  If an "lvremove" is immediately followed by an "lvcreate" for an LV
-  with the same name, "mkswap" (and maybe other commands) occasionally
-  fail with "Device or resource busy". Work around it by using sync
-  and sleep.
-
-Distribution Releases Changes
------------------------------
-
-* Support for Ubuntu 16.10 Yakkety Yak.
-* Preliminary support for Ubuntu 17.04 Zesty Zapus.
-* Knows about code names for Debian 10 (Buster) and 11 (Bullseye).
-* Considers Debian Squeeze, Ubuntu Vivid and Wily being EoL.
-* Knows about Ubuntu's "devel" alias.
-
-Other Changes
--------------
-
-* Risen default values for RAM sizes in /etc/xen-tools/xen-tools.cfg
-  to cope with risen resource consumption and availability. (Closes
-  Debian bug report #849867)
-* Default file system is now ext4 (instead of ext3).
-
-Test Suite
-----------
-
-* release-testing:
-  + Mitigate race conditions with immediately re-used LVs:
-    - Use per-test-unique host names.
-    - Delete potential old images by testing xen-delete-image before
-      calling xen-create-image. Add sync and sleep calls inbetween
-      those two commands, too.
-  + Use "set -e" instead of "|| break".
-  + Declare testability in distributions.conf instead of hardcoding
-    it. Mark buster and bullseye as not testable, too, for now.
-
-
-xen-tools 4.6.2 (released 23 Dec 2015)
-======================================
-
-Bug Fixes
----------
-
-* Make t/hooks-inittab.t using its own copy of the generic
-  /etc/inittab for testing instead of using the system one's. (GH#36,
-  should fix autopkgtest on systems with modified /etc/inittab)
-* Fix unescaped braces (deprecated since Perl 5.22) in
-  t/plugin-checks.t.
-
-Other changes
--------------
-
-* Support for using pygrub from /usr/local/bin/pygrub.
-* Typo fixes.
-
-
-xen-tools 4.6.1 (released 24 Oct 2015)
-======================================
-
-Distribution Releases Changes
------------------------------
-
-* Preliminary support for Ubuntu 16.04 LTS Xenial Xerus.
-
-Bug Fixes
----------
-
-* Fix Perl warning in t/hook-inittab.t if /etc/inittab isn't present.
-
-Other Changes
--------------
-
-* Declare GitHub as primary hosting.
-* Integrate BUGS.markdown into README.markdown, move remaining
-  contents of KNOWN_BUGS.markdown to the GitHub issue tracker.
-* Minor README improvements.
-* Neither use $#array in boolean context nor @array = undef anymore.
-
-
-xen-tools 4.6 (released 20 Jul 2015)
-====================================
-
-New Features and Major Changes
-------------------------------
-
-* Drop all occurrences of apt's `--force-yes` parameter. It only
-  forces the installation of untrusted packages and that's
-  unwanted. (Closes Debian bug report #776487)
-* Support passing commandline options with `--debootstrap-cmd`.
-* Use MD5 as default hash method again, to be able to properly set
-  passwords in older releases. Does not affect passwords changed later
-  inside the DomU.
-* Split off hardcoded release code names list and default mirrors in
-  `xen-create-image` into separate configuration file which is parsed
-  before the default settings or command-line options are set.
-* Report all SSH fingerprints of the created DomU, not only RSA ones.
-* Support VLANs with Open vSwitch (GH-2). Thanks to Félix Barbeira for
-  the patch.
-
-
-New Options
------------
-
-* `--keyring` (xen-create-image, xt-install-image)
-* `--vlan`  (xen-create-image)
-
-Distribution Releases Changes
------------------------------
-
-* Debian 9 Stretch (preliminary support)
-* Ubuntu 15.10 Wily Werewolf (preliminary support; not yet supported by
-  debootstrap, see Debian bug report #787117)
-* Ubuntu 10.04 Lucid Lynx is now EoL.
-* Ubuntu 14.10 Utopic Unicorn is now EoL.
-
-Improvements
-------------
-
-* Make test suite support as-installed-testing.
-* Multiple release workflow improvements (target `release` in
-  `Makefile`).
-* Supports `unstable`, `oldstable` and `oldoldstable` as distribution
-  names, too. (`oldoldstable` is not yet supported by debootstrap, see
-  Debian feature request #792734 in debootstrap.)
-
-Bug Fixes
----------
-
-* Fix usage of nonexistent variable in `removeDebianPackage` (Closes
-  Debian bug report #774936) Thanks Lukas Schwaighofer!
-* Allows `#` within configuration file comments. (Closes Debian bug
-  report #783060; thanks Jean-Michel Nirgal Vourgère for the bug
-  report and patch!)
-* Use `-o APT::Install-Recommends=false` instead of
-  `--no-install-recommends` for backwards compatibility with older APT
-  versions which don't know either (but accept any `Foo=Bar` parameter
-  to `-o`). Allows one to install earlier Debian releases (e.g. Etch)
-  with the default configuration again.
-* Pass `--yes` to `lvcreate` only if LVM version is 2.02.99 or
-  higher. Fixes regression introduced with 4.5 by the fix for Debian
-  bug report #754517.
-
-Other Changes
--------------
-
-* Change all occurrences of `http.debian.net` to
-  `httpredir.debian.org`.
-* Installs bash completion into `/usr/share/bash-completion/` (fixes
-  lintian warning `package-install-into-obsolete-dir`)
-* Testsuite: Optimize and clean up modules.sh.
-* Split up test suite in functionality/compatibility tests (`t`) and
-  author/release tests (`xt`).
-* New example script helpful for release testing.
-
-
-xen-tools 4.5 (released 25 Oct 2014)
-====================================
-
-New Features and Major Changes
-------------------------------
-
-* Apply patch by Adrian C. (anrxc) to allow to override hooks in
-  `/usr/share/xen-tools/*.d/` with hooks in `/etc/xen-tools/hooks.d/`.
-
-Distribution Releases Changes
------------------------------
-
-* Ubuntu 14.10 Utopic Unicorn.
-* Ubuntu 15.04 Vivid Vervet (preliminary support)
-* Mark Ubuntu 13.10 Saucy Salamander as EoL
-
-Improvements
-------------
-
-* Use `686-pae` kernels instead of `686` kernels on Debian Wheezy and
-  later. Thanks to Daniel Lintott! (Closes Debian bug report #742778)
-* Pass `-y` option ("assume yes") to `yum` (Closes Debian bug report
-  #735675) Thanks Lionel FÉLICITÉ!
-
-Bug Fixes
----------
-
-* Fix always empty gateway on Debian DomUs (Thanks Joan! LP: #1328794)
-* Fix `lvcreate` awaiting user input when creating swap LV (Closes
-  Debian bug report #754517) Thanks Eric Engstrom!
-* Fix missing quoting in shell function `assert` in `hooks/common.sh`.
-* Fix initial configuration summary in cases where `pygrub` is used.
-* Fix corner cases where not the latest kernel would have been
-  checked.
-* `--password` overrides `--genpass`. (Closes Debian bug report
-  #764143) Based on patch by Santiago Vila.
-* Fix unaligned maxmem output of xen-create-image. (Closes Debian bug
-  report #764126; Patch by Santiago Vila)
-* Fix copy & paste errors in comments in typos in `roles/puppet`
-  (Closes Debian bug report #764134; Patch by Santiago Vila)
-* Fix typos in POD of `xen-create-image` (Closes Debian bug report
-  #764153; Patch by Santiago Vila)
-
-Other Changes
--------------
-
-* Drop all xend related sanity checks, they cause more havoc nowadays
-  than they help. Thanks Ian Campbell! (Closes Debian bug report
-  #732456)
-* pygrub detection: Prefer `/usr/lib/xen-default` over `/usr/lib/xen-x.y`.
-* Add password length sanity check with fallback to default length.
-* Raise default password length from 8 to 23.
-* Flush output after each line in `runCommand()`.
-* `Makefile`: Clean up coverage data in multiple targets.
-
-
-xen-tools 4.4 (released 11 Dec 2013)
-====================================
-
-Listing includes changes of according beta releases.
-
-New Features and Major Changes
-------------------------------
-
-* Preliminary support for `xl` toolstack
-* Ships `/etc/initramfs-tools/conf.d/xen-tools` for generating Dom0
-  initrds also suitable for DomU usage. Trigger `update-initramfs`.
-* Installs a legacy `grub` in all `pygrub` based Debian/Ubuntu DomUs
-  to be able to update the `menu.list` automatically.
-* `hooks/common.sh`: `installDebianPackage` no more installs
-  recommends, use `installDebianPackageAndRecommends` for that from
-  now on.
-* `hooks/common.sh`: Rename `installCentOS4Package` to
-  `installRPMPackage`.  Add `installCentOS4Package` wrapper for
-  backward compatibility.
-* Better documents and checks requirements for the `--apt_proxy`
-  value. (See #623443 for the corresponding apt issue.) Requires now
-  `Data::Validate::URI`.
-* Uses now `Data::Validate::Domain` and `Data::Validate::IP` for IP
-  addresses and hostname checks.
-
-Newly Supported Distribution Releases
--------------------------------------
-
-* Debian 8 Jessie
-* Ubuntu 13.04 Raring
-* Ubuntu 13.10 Saucy (preliminary support; debootstrap doesn't have
-  support for Saucy at the time of writing)
-
-Improvements
-------------
-
-* Also recognize "M" and "G" instead of "MB" and "GB" as size unit for
-  `--memory`. Also document the recognized units. (Closes Debian bug
-  report #691320)
-* `xen-list-images` now also outputs the file name of the config file.
-* `xen-list-images` and `xen-delete-image` now understand `--extension`.
-* Makefile accepts `DESTDIR=…`
-* Move examples from debian/examples to examples.
-* Adds default mount options for ext4, identical to ext2/ext3.
-* By default install `linux-image-virtual` instead of
-  `linux-image-server` on Ubuntu Intrepid and newer (Hopefully closes:
-  #640099, LP #839492)
-* Makes some options (like `--pygrub`) negatable.
-* Rework "minimal" role to be less based on personal preferences:
-  * No more installs sudo, vim, syslog-ng, etc.
-  * Fixes usage together with pygrub.
-
-Bug Fixes
----------
-
-* Fix symbolic link hooks/centos-6/15-setup-arch (Closes Debian bug
-  report #690299)
-* Execute END block not on --version/--help/--manual (Closes Debian
-  bug #684346)
-* Move code for `--boot` feature to `END` block. Fixes missing SSH
-  fingerprint display if `--boot` was used. (Closes Debian bug report
-  #679183)
-* Correctly handle aborts in `END` block. (Closes Debian bug report
-  #704882)
-* Fixes `--extension=` with empty parameter.
-* Sarge amd64 case handle properly
-* `xt-install-image`: Don't bail out if only `cdebootstrap` is
-  installed but not `debootstrap` (Thanks Elmar Heeb!)
-* Fix filesystem tools installation in `91-install-fs-tools` (which
-  was broken since 4.3~rc1-1) by merging `91-install-fs-tools back`
-  into `90-make-fstab`. (Closes Debian bug report #715340) Also
-  supports RPM-based distributions now.
-* Fixes creation of `ARRAY(0x#).log` named log files.
-
-Other Changes
--------------
-
-* Code deduplication to unify the `xen-*-image` scripts
-* Moves `/usr/lib/xen-tools/` to `/usr/share/xen-tools/`
-* Use `http.debian.net` as default Debian mirror if no mirror is given
-  and `xt-guess-suite-and-mirror` is not used.
-* Default DomUs to use the noop scheduler (Closes Debian bug report
-  #693131)
-* Fixes export of environment variables. Previously they could contain
-  dashes and then were only accessible from within Perl, but not from
-  within Bash.
-* Uses `Test::NoTabs` instead of its own test for that.
-* Removes unused Perl modules `Xen::Tools` and `Xen::Tools::Log` from
-  source code. Also removes the according tests from the test
-  suite. No more needs `Moose`.
-
-
 xen-tools 4.3.1 (released 30-Jun-2012)
 ======================================
 
@@ -441,28 +7,6 @@ Bugfix Release only
 xen-tools 4.3 (released 26-Jun-2012)
 ====================================
 
-Listing includes changes of according beta releases.
-
-New Features and Major Changes
-------------------------------
-
-* Massive code deduplication in hooks directory
-
-New Options
------------
-
-* `--dontformat` (xen-create-image)
-* `--finalrole`  (xen-create-image)
-* `--apt_proxy`  (xen-create-image)
-
-Newly Supported Distribution Releases
--------------------------------------
-
-* Ubuntu 11.10 Oneiric
-* Ubuntu 12.04 Precise
-* Ubuntu 12.10 Quantal
-* CentOS 6
-
 Bug Fixes
 ---------
 
@@ -475,6 +19,30 @@ Other Changes
 * Remove most Mercurial traces
 
 
+xen-tools 4.3rc1 (released 08 Jun 2012)
+=======================================
+
+New Features and Major Changes
+------------------------------
+
+* Massive code deduplication in hooks directory
+
+New Options
+-----------
+
+    --dontformat (xen-create-image)
+    --finalrole  (xen-create-image)
+    --apt_proxy  (xen-create-image)
+
+Newly Supported Distribution Releases
+-------------------------------------
+
+* Ubuntu 11.10 Oneiric
+* Ubuntu 12.04 Precise
+* Ubuntu 12.10 Quantal
+* CentOS 6
+
+
 xen-tools 4.2.1 (released 17 Mar 2011)
 ======================================
 
@@ -497,11 +65,11 @@ New Options
 New Features and Major Changes
 ------------------------------
 
-* Uses `hvc0` and `xvda` devices by default
+* Uses hvc0 and xvda devices by default
-* Also supports `cdebootstrap`
+* Also supports cdebootstrap
 * Preliminary btrfs support.
 * Uses GeoIP for Debian mirrors: Default Debian mirror is now
-  `cdn.debian.net`, see https://wiki.debian.org/DebianGeoMirror for
+  cdn.debian.net, see http://wiki.debian.org/DebianGeoMirror for
   details.
-* New helper program `xt-guess-suite-and-mirror`, used to find the
+* New helper program xt-guess-suite-and-mirror, used to find the
   default mirror and suite.

README.markdown

@@ -1,15 +1,11 @@
 xen-tools
 =========
 
-[![Travis CI Build Status](https://api.travis-ci.org/xen-tools/xen-tools.svg)](https://travis-ci.org/xen-tools/xen-tools)
+* [Homepage](http://www.xen-tools.org/software/xen-tools)
-
+* Git Repository:
-* [Homepage](https://www.xen-tools.org/software/xen-tools)
+  * [at Gitorious](http://gitorious.org/xen-tools)
-* [Change Log](https://github.com/xen-tools/xen-tools/blob/master/NEWS.markdown)
+  * [at GitHub](http://github.com/xtaran/xen-tools)
-* Official Git Repositories:
+* [Mailing Lists](http://www.xen-tools.org/software/xen-tools/lists.html)
-  * [at GitHub](https://github.com/xen-tools/xen-tools) (primary, includes [Issue Tracker](https://github.com/xen-tools/xen-tools/issues))
-  * [at GitLab](https://gitlab.com/xen-tools/xen-tools) (secondary, doesn't support the `git://` protocol.)
-* Historical Git Repository: [at Gitorious](https://gitorious.org/xen-tools) (_outdated_, no more updated, for historical reference only)
-* [Mailing Lists](https://www.xen-tools.org/software/xen-tools/lists.html)
 
 About
 -----
@@ -18,11 +14,11 @@ xen-tools contains a collection of Perl scripts for working with Xen
 guest images under Linux.
 
 Using this software, you can easily create new
-[Xen](http://www.xen.org/) guests configured to be accessible over the
+[Xen](http://www.xen.org) guests configured to be accessible over the
 network via [OpenSSH](http://www.openssh.org/).
 
 xen-tools currently has scripts to install most releases of
-[Debian](https://www.debian.org/) (starting with 3.1 "Sarge") and
+[Debian](http://www.debian.org/) (starting with 3.1 "Sarge") and
 [Ubuntu](http://www.ubuntu.com/) (starting with 6.06 LTS "Dapper") and
 some RPM-based distributions. On the Dom0 side all current Xen
 supporting distributions should work.
@@ -32,74 +28,35 @@ known to work reliably, i.e.:
 
 ### Debian
 
-* Sarge 3.1 (i386 and DomU only) [¹](#1)
+* Sarge 3.1 (i386 and DomU only)
-* Etch 4.0 (Dom0 no more tested) [¹](#1)
+* Etch 4.0 (Dom0 no more tested)
-* Lenny 5.0 (Dom0 no more tested) [¹](#1)
+* Lenny 5.0
-* Squeeze 6.0 (Dom0 no more tested) [¹](#1)
+* Squeeze 6.0
-* Wheezy 7 (Dom0 no more tested) [¹](#1)
+* Wheezy 7.0
-* Jessie 8
+* Jessie 8.0 (preliminary support as it's not yet available)
-* Stretch 9
+* Sid (works at least at the moment of writing :-)
-* Buster 10
-* Bullseye 11 (under development)
-* Bookworm 12 (knows about this future release name)
-* Trixie 13 (knows about this future release name)
-* Sid (always under development; works at least at the moment of writing :-)
 
 ### Ubuntu
 
 (only DomUs tested)
 
-* Dapper Drake 6.06 (LTS) [¹](#1) [²](#2)
+* Dapper Drake 6.06 (needs editing of `/usr/share/debootstrap/scripts/dapper` since at least debootstrap version 1.0.37, see [#659360][1])
-* Edgy Eft 6.10 [¹](#1) [²](#2)
+* Edgy Eft 6.10 (needs editing of `/usr/share/debootstrap/scripts/edgy` since at least debootstrap version 1.0.37, see [#659360][1])
-* Feisty Fawn 7.04 [¹](#1)
+* Feisty Fawn 7.04
-* Gutsy Gibbon 7.10 [¹](#1)
+* Gutsy Gibbon 7.10
-* Hardy Heron 8.04 (LTS, see [Installing Ubuntu 8.04 as DomU][2]) [¹](#1)
+* Hardy Heron 8.04 (see [Installing Ubuntu 8.04 as DomU][2])
-* Interpid Ibex 8.10 [¹](#1)
+* Interpid Ibex 8.10
-* Jaunty Jackaplope 9.04 [¹](#1)
+* Jaunty Jackaplope 9.04
-* Karmic Koala 9.10 [¹](#1)
+* Karmic Koala 9.10
-* Lucid Lynx 10.04 (LTS) [¹](#1)
+* Lucid Lynx 10.04
-* Maverick Meerkat 10.10 [¹](#1)
+* Maverick Meerkat 10.10
-* Natty Narwhal 11.04 [¹](#1)
+* Natty Narwhal 11.04
-* Oneiric Ocelot 11.10 [¹](#1)
+* Oneiric Ocelot 11.10
-* Precise Pangolin 12.04 (LTS) [¹](#1)
+* Precise Pangolin 12.04
 * Quantal Quetzal 12.10
-* Raring Ringtail 13.04
+* Raring Ringtail 13.04 (preliminary support as it's not yet available)
-* Saucy Salamander 13.10
-* Trusty Tahr 14.04 (LTS)
-* Utopic Unicorn 14.10
-* Vivid Vervet 15.04
-* Wily Werewolf 15.10
-* Xenial Xerus 16.04 (LTS)
-* Yakkety Yak 16.10
-* Zesty Zapus 17.04
-* Artful Aardvark 17.10
-* Bionic Beaver 18.04 (LTS)
-* Cosmic Cuttlefish 18.10
-* Disco Dingo 19.04
-* Eoan Ermine 19.10
-* Focal Fossa 20.04 (LTS)
-* Groovy Gorilla 20.10
-* Hirsute Hippo 21.04 (under development)
 
-### Footnotes
+[1]: http://bugs.debian.org/659360
-
-<dl compact="compact">
-
-<dt><a id="1" name="1">¹</a></dt><dd>
-
-Installation with `xen-create-image` and updating with
-`xen-update-image` might fail with newer kernels/distributions as Dom0
-without `vsyscall=emulate` on the kernel commandline.
-
-</dd><dt><a id="2" name="2">²</a></dt><dd>
-
-At least between debootstrap version 1.0.37
-and 1.0.93 (including) these distributions needs editing of
-`/usr/share/debootstrap/scripts/edgy`, see [#659360][1].
-
-</dd></dl>
-
-[1]: https://bugs.debian.org/659360
     "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"
 
 [2]: http://www.linux-vserver.org/Installing_Ubuntu_8.04_Hardy_as_guest
@@ -125,56 +82,29 @@ Requirements
 
 To use these tools you'll need the following software:
 
-* [debootstrap](https://packages.debian.org/debootstrap)
+* [debootstrap](http://packages.debian.org/debootstrap)
-* Perl and the following Perl modules
+* Perl
-  * [Config::IniFiles](https://metacpan.org/release/Config-IniFiles)
+  * The Perl module [Text::Template](http://search.cpan.org/dist/Text-Template/)
-	([Debian Package libconfig-inifiles-perl](https://packages.debian.org/libconfig-inifiles-perl))
+	([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
-  * [Text::Template](https://metacpan.org/release/Text-Template)
+  * The Perl module [Config::IniFiles](http://search.cpan.org/dist/Config-IniFiles/)
-	([Debian Package libtext-template-perl](https://packages.debian.org/libtext-template-perl))
+	([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
-  * [Data::Validate::Domain](https://metacpan.org/release/Data-Validate-Domain)
+* Make, if you are not installing through a package manager
-	([Debian Package libdata-validate-domain-perl](https://packages.debian.org/libdata-validate-domain-perl))
-  * [Data::Validate::IP](https://metacpan.org/release/Data-Validate-IP)
-	([Debian Package libdata-validate-ip-perl](https://packages.debian.org/libdata-validate-ip-perl))
-  * [Data::Validate::URI](https://metacpan.org/release/Data-Validate-URI)
-	([Debian Package libdata-validate-uri-perl](https://packages.debian.org/libdata-validate-uri-perl))
-  * [File::Slurp](https://metacpan.org/release/File-Slurp)
-	([Debian Package libfile-slurp-perl](https://packages.debian.org/libfile-slurp-perl))
-  * [File::Which](https://metacpan.org/release/File-Which)
-	([Debian Package libfile-which-perl](https://packages.debian.org/libfile-which-perl))
-  * and some more modules which are part of the Perl core and hence do not need to be installed separately.
-* "Make", if you are not installing through a package manager.
 
 You can try to install RPM-based distributions such as CentOS, or
 Fedora Core, but you will need a correctly installed and configured
-[rinse](https://packages.debian.org/rinse) package. This is currently
+[rinse](http://packages.debian.org/rinse) package. This is currently
 not fully supported.
 
 If you wish to create new Xen instances which may be controlled by
 users via a login shell you can have a look at the (currently
-unmaintained) [xen-shell](https://xen-tools.org/software/xen-shell/)
+unmaintained) [xen-shell](http://xen-tools.org/software/xen-shell/)
 project.
 
-### Caveats
-
-For security reasons (avoid risk to circumvent [ASLR][3]), recent kernels
-have disabled the `vsyscall` mapping. Unfortunately older
-distributions don't run and hence can't be bootstrapped without it.
-
-To enable trapping and enabling emulate calls into the fixed
-vsyscall address mapping and hence to run and bootstrap older Linux
-distributions in a chroot (as xen-tools does), you need to add
-`vsyscall=emulate` to the kernel commandline, e.g. by adding it to
-`GRUB_CMDLINE_LINUX_DEFAULT` in `/etc/default/grub`, then running
-`update-grub` afterwards and finally reboot.
-
-[3]: https://en.wikipedia.org/wiki/Address_space_layout_randomization
-     "Address Space Layout Randomization"
-
 
 Installation
 ------------
 
-As root or with sudo, execute `make install`.
+As root or with sudo, execute `make instal`.
 
 See `debian/README.source` how to build the Debian package from a
 checked out copy of the git repository (i.e. without a source tar
@@ -244,58 +174,6 @@ image.
 * The script should only be used for Xen instances of Debian or a
   Debian-derived distribution.
 
-Version Numbering Scheme
-------------------------
 
-Since release 4.4, the version numbering scheme of xen-tools tries to
+-- 
-comply with the [Semantic Versioning](http://semver.org/)
-specification, with the only exception that trailing zeroes are
-omitted.
-
-Between the releases 3.9 and 4.4, the version numbering scheme
-followed roughly the same ideas, but less strict.
-
-Test Suite Coverage
--------------------
-
-[![Coverage Status](https://coveralls.io/repos/xen-tools/xen-tools/badge.svg?branch=master)](https://coveralls.io/r/xen-tools/xen-tools?branch=master)
-
-Despite parts of the test suite are quite old, it only tests a small
-fraction of what xen-tools can do. Some of the scripts currently could
-only be tested on an actual Xen Dom0. Hence the
-[code coverage of xen-tools' test suite is quite bad](https://coveralls.io/r/xen-tools/xen-tools).
-
-Bugs
-----
-
-### Reporting Bugs
-
-If you're using the current packages included as part of the Debian
-GNU/Linux distribution or a derivative, please first report any bugs
-using the distribution's way to report bugs.
-
-In case of Debian this would be using e.g. `reportbug xen-tools`.
-
-If you're using the xen-tools built from source tar ball, please
-[report bugs via GitHub's issue tracker](https://github.com/xen-tools/xen-tools/issues/new),
-or, if you don't want to create a GitHub account or are not sure if
-it's really a bug, feel free to just write an e-mail to the
-[xen-tools dicsussion mailing list](mailto:xen-tools-discuss@xen-tools.org).
-
-If you're capable of fixing it yourself a patch is appreciated, and a
-test case would be a useful bonus.
-
-### Known/Open Issues
-
-You can check the following ressources for known or open issues:
-
-* [xen-tools Issue Tracker at GitHub](https://github.com/xen-tools/xen-tools/issues)
-  (primary upstream bug tracker)
-* [Mailing list archives of the xen-tools mailing lists](https://xen-tools.org/software/xen-tools/lists.html)
-  (might contain, loose, non-formal bug reports)
-* [TODO file in the source code](https://github.com/xen-tools/xen-tools/blob/master/TODO.markdown)
-* [xen-tools in the Debian Bug Tracking System](https://bugs.debian.org/xen-tools)
-* [xen-tools in Ubuntu's Launchpad](https://bugs.launchpad.net/ubuntu/+source/xen-tools)
-
-—
 The Xen-Tools Developer Team

SUPPORT.markdown

@@ -3,11 +3,11 @@ Mailing List
 
 For assistance on using, or customising, these scripts please consult
 the manpages initially, then the
-[website](https://xen-tools.org/software/xen-tools/).
+[website](http://xen-tools.org/software/xen-tools/).
 
 If these are not sufficient resources please consider posting any
 queries you might have to the [mailing
-list](https://xen-tools.org/software/xen-tools/lists.html)
+list](http://xen-tools.org/software/xen-tools/lists.html)
 
 Included with the release you should find the file `BUGS.markdown`
 which contains some notes on reporting bugs.
@@ -18,13 +18,13 @@ Xen Queries
 
 If your query is mostly related to Xen, rather than these tools, then
 please consider joining the [xen-users mailing
-list](https://lists.xenproject.org/cgi-bin/mailman/listinfo/xen-users)
+list](http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-users)
 
 The members of that list are very good at diagnosing issues with
 networking, block devices, and other Xen oddities.
 
 There's also the IRC channel `##xen` (the double hashmark is not a
- typo) on the [Freenode](https://freenode.net/) IRC network.
+ typo) on the [Freenode](http://freenode.net/) IRC network.
 
 
 Contact The Author
@@ -34,7 +34,7 @@ As a last resort you can to contact the current maintainer, Axel
 Beckert, at <abe@deuxchevaux.org>.
 
 As the previous xen-tools maintainer and original author, Steve
-Kemp, said, I say "last resort" not because I'm unwilling to help, but
+Kemp, said, I say last resort not because I'm unwilling to help, but
 because it may take longer for me to respond to you personally.
 
 -- 

TODO.markdown

@@ -1,13 +1,16 @@
 TODO
 ====
 
-Most things which used to be in here were moved to
+See KNOWN_BUGS.markdown for real bugs.
-[xen-tools' issue tracker at GitHub](https://github.com/xen-tools/xen-tools/issues).
 
 Bugs to fix and features to add for 5.0
 ---------------------------------------
 
-* Fix xdm and gdm roles wrt. to uptodate package names.
+* `xen-create-image` man page overhaul:
+
+  * ambiguous option list with regards to parameters
+  * Set Fail in more situations where the script has clearly failed
+    i.e.: lvm exists
 
 * Test and support more file system types.
 
@@ -19,6 +22,63 @@ Bugs to fix and features to add for 5.0
   Currently no locales are set and this causes several domU errors
   which appear in the domU's logs.
 
+* Documentation overhaul
+
+  Better explain what roles /should be/ used for, and that roles
+  are examples, and shouldn't cover every single scenario. They
+  are also easy to write.
+
+* Think again about disk_device checks :
+
+  Newer Xen provides `xvda`, older provided `sda`. The current check for
+  valid values of `disk_device` (used for root device in DomU `/etc/fstab`)
+  does only allow those values.
+
+  This forbids any deployment of LVM/RAID _inside_ DomU, which cannot
+  be created by xen-tools anyway. So the current check is fine with the
+  current possibilities of xen-tools, but could become a limitation.
+  * Is it possible/wanted to "query" xend for default device names?
+  * Is it possible to create `/dev/mapper` devices with xend conf?
+  * Can we just avoid to ask for this value and not specify the device
+    in `/etc/fstab` (and use `/dev/root`, `/dev/by-uuid`, or anything?)
+
+* `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.
+
 * Generic grub support
 
   This will generate a much nicer `menu.lst` as a side effect, as its
@@ -27,6 +87,47 @@ Bugs to fix and features to add for 5.0
   new kernel is installed and will also use the domU distro's `menu.lst`
   conform.
 
+* pv-grub support
+
+  This is a ways away and will probably start with a `xen-pv-grub`
+  package.
+
+* Move the hooks directory to `/etc/xen-tools/` to officially allow
+  added and modified hooks.
+
+* Clean up the hooks directory
+
+  We still have a link farm for hooks and a meta link farm for distro
+  releases created on `make install`. It probably would be better if
+  we would just have one directory per distro (like with debian) but
+  without the need to created symlinks on `make install`.
+
+  Currently CentOS's `25-setup-kernel` creates an fstab and
+  `90-make-fstab` does again. It works, but that cries for debugging
+  hell.
+
+  `centos-5/25-setup-kernel` and `centos-6/25-setup-kernel` still
+  differ and I'm not sure if that's necessary respectively what's the
+  common denominator.
+
+  `80-install-kernel` is not yet merged into one hook script.
+
+  Common oneliners for code deduplication in the hooks/ directory:
+
+    $ find -L . -not -xtype l -not -type d -not -path '*/common/*' | sort -t / -k3
+    $ fdupes -r1 . | sort -t / -k3
+    $ find . -type f | sim_text -ipTt 50 | tac | column -t
+
+* 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.
+
+  Potential ideas are to add options to add a given file as
+  `authorized_keys` (e.g. a users public key) or to just add the Dom0's
+  `/root/.ssh/authorized_keys` as the DomU's one.
+
 * More generic roles
 
   Deploy a web server or setup ssmtp directly via flag when setting up
@@ -40,14 +141,52 @@ Bugs to fix and features to add for 5.0
   "type" of configuration you want, and a set of options specific to
   that flag could be parsed from xen-tools.conf
 
+* Refactor the code for less variants of calling `cp`, `rm`, `mv`, etc.
+
+  E.g. always use either `cp()` from `File::Copy` or `/bin/cp`, but
+  not both. To allow verbose copying, I (Axel) would prefer `/bin/cp`
+  over `cp();`.
+
 * Parse numerical parameters transparently for the user
 
   The user shouldn't have to know whether he should specify size as
   `<size>G` or `<size>Gb` or `<size>`. This should be parsed without
   user interaction and rely on a common format.
 
+* `xen-update-image` should mount `/dev/pts` before running apt-get
+
+* `xen-update-image` should have options for using …
+
+   * aptitude instead of apt-get
+   * dist-upgrade instead of upgrade
+
+* Support `cpu_weight` and other features from
+  http://wiki.xensource.com/xenwiki/CreditScheduler
+
 * Make used Xen toolstack configurable, i.e. via --xen-toolstack=xl
 
+* Code Deduplication / Refactor the code for less code duplication
+
+  `bin/x*` currently contain the same or similar code like e.g. in the
+  function readConfigurationFile. This needs to be cleaned up.
+
+* Unify --debug and --dumpconfig. Likely make --debug exit
+  gracefully. Document --debug if --dumpconfig is removed.
+
+* Use `Perl::Critic`
+
+* Refactor the different Ubuntu hooks directories so that only one
+  ubuntu hooks directory is left.
+
+  Then also refactor TLS disabling so that it works on all
+  distributions the same. Currently Debian is a special case and
+  Ubuntu half a special case.
+
+* Replace findBinary() with File::Which
+
+* Remove from the (unused) Xen::Tools what's already in the used
+  Xen::Tools::Common.
+
 * Add test for `--size` constraints (upper- and lowercase letters,
   with and without `B`, etc.)
 
@@ -55,19 +194,54 @@ Bugs to fix and features to add for 5.0
     `xen-create-image` first. Which probably both would be a good
     idea.
 
-* Maybe check for `vsyscall=emulate` in `GRUB_CMDLINE_LINUX_DEFAULT`
-  in `/etc/default/grub` if trying to install an affected Linux
-  distribution.
-
-* Drop checking the host's sources.list to decide upon including the
-  security repo or not.
-
-* Make a difference wrt. to the security repo for EoL releases.
-
-
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------
 
 * Write more test cases.
 
 * `xen-delete-image` should unallocate any used IP addresses.
+
+* `installGentooPackage` in `hooks/common.sh` is a stub and does
+  nothing yet.
+
+Axel's Break-Backwards-Compatibility Wishlist
+---------------------------------------------
+
+* Make empty extension the default
+
+  This would ease tab completion and CLI parameter reusage with "xm
+  create" and friends.
+
+* Check if we can reduce `MAKEDEV` invocations in
+  `hooks/common/55-create-dev`
+
+  `MAKEDEV std` is called in any case. First comment says "Early
+  termination if we have a couple of common devices present should
+  speed up installs which use `--copy`/`--tar`" and then "We still
+  need to make sure the basic devices are present" and calls `MAKEDEV`
+  more often than otherwise.
+
+  Additionally the `55-create-dev` for CentOS/Fedora just created
+  `console`, `zero` and `null`. `zero` and `null` are part of `MAKEDEV
+  std`, perhaps can we reduce it to that. `console` is part of
+  `MAKEDEV generic`.
+
+  Additionally the devices `hda`, `sda` and `tty1` may not necessary
+  in any case, but instead `hvc0` should be created for sure in many
+  cases. Nothing cares about `$serial_device` there either.
+
+  Current `MAKEDEV` implementation support more than one device as
+  parameter. That could reduce the `MAKEDEV` calls from currently six
+  to two.
+
+* Uncouple generating auto start symlinks from `--boot`.
+
+  Maybe add some `--autostart` or such.
+
+* Maybe replace findBinary with File::Which
+
+* MAC addresses should no more depend on the distribution.
+
+* Let the admin switch between MAC addresses based on XenSource's OUI,
+  its organisation's own OUI or locally administrated MAC addresses.
+  See also http://wiki.xen.org/wiki/Xen_Networking#MAC_addresses

bin/xen-create-nfs

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
@@ -74,12 +72,12 @@ Show the version number and exit.
   For more details on what you'll need to support NFS-root Xen guests
  the following article, written by the author, might be useful:
 
-    https://debian-administration.org/articles/505
+    http://www.debian-administration.org/articles/505
 
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
  Stéphane Jourdois
 
 
@@ -121,7 +119,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 # store version number away.
@@ -282,7 +280,7 @@ sub testArguments
     die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );
 
 
-    # Shorthack to fix https://bugs.debian.org/648814 -- xen-create-nfs
+    # Shorthack to fix http://bugs.debian.org/648814 -- xen-create-nfs
     # should better use xt-create-xen-config instead. Guess from where
     # this code is borrowed for now...
 

bin/xen-delete-image

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-delete-image - Delete previously created Xen instances.
@@ -24,13 +22,13 @@ xen-delete-image - Delete previously created Xen instances.
    --dir      Specify the output directory where images were previously saved.
    --evms     Specify the EVMS container to use.
    --lvm      Specify the LVM volume to use.
-   --zpool    Specify the ZFS pool to use.
 
   Specifying hosts:
    --hostname Specify the image name to delete.
 
   Testing options:
    --test      Don't complain if we're not invoked by root.
+   --no-xen-ok Don't complain if xen seems not installed or xend is not running
 
 
 =head1 OPTIONS
@@ -52,15 +50,11 @@ Specify the hostname to delete.
 =item B<--lvm>
 Specify the LVM volume group where images were previously saved.
 
-=item B<--zpool>
-Specify the ZFS pool where images were previously saved.
-
 =item B<--manual>
 Read the manual for this script.
 
 =item B<--test>
-Do not complain, or exit, if the script is not executed by the root
+Do not complain, or exit, if the script is not executed by the root user.
-user. (Only works in conjunction with --dir.)
 
 =item B<--version>
 Show the version number and exit.
@@ -130,8 +124,8 @@ Show the version number and exit.
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
 
@@ -167,7 +161,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 #
@@ -208,12 +202,12 @@ checkArguments();
 #
 if ( ( !$CONFIG{ 'test' } ) && ( $EFFECTIVE_USER_ID != 0 ) )
 {
-    print <<EOROOT;
+    print <<E_O_ROOT;
 
   This script is not running with root privileges, so the configuration
  file(s) beneath /etc/xen will not be removed.
 
-EOROOT
+E_O_ROOT
 
     exit 127;
 }
@@ -236,7 +230,7 @@ foreach my $name (@ARGV, @hosts)
 {
     my %PER_HOST_CONFIG = %CONFIG;
     $PER_HOST_CONFIG{ 'hostname' } = $name;
-    unless ( xenRunning($name, \%PER_HOST_CONFIG) )
+    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%PER_HOST_CONFIG) )
     {
         deleteXenImage($name);
     }
@@ -269,68 +263,22 @@ sub parseCommandLineArguments
     my $VERSION = 0;
     $CONFIG{ 'dry-run' } = 0;
 
-    #
-    #  We record the installation method here because we want
-    # to ensure that we allow the method supplied upon the command line
-    # to overwrite the one we might have ready read from the configuration
-    # file.
-    #
-    my %install;
-    $install{ 'evms' }      = undef;
-    $install{ 'dir' }       = undef;
-    $install{ 'lvm' }       = undef;
-    $install{ 'zpool' }     = undef;
-
     #  Parse options.
     #
-    GetOptions( "dir=s",       \$install{ 'dir' },
+    GetOptions( "dir=s",       \$CONFIG{ 'dir' },
                 "dry-run",     \$CONFIG{ 'dry-run' },
-                "lvm=s",       \$install{ 'lvm' },
+                "lvm=s",       \$CONFIG{ 'lvm' },
-                "evms=s",      \$install{ 'evms' },
+                "evms=s",      \$CONFIG{ 'evms' },
-                "zpool=s",     \$install{ 'zpool' },
                 "extension:s", \$CONFIG{ 'extension' },
                 "hostname=s@", \$CONFIG{ 'hostname' },
                 "test",        \$CONFIG{ 'test' },
                 "verbose",     \$CONFIG{ 'verbose' },
-                "no-xen-ok",   sub { warn "Option --no-xen-ok is deprecated and ignored."; },
+                "no-xen-ok",   \$CONFIG{ 'no_xen_ok' },
                 "help",        \$HELP,
                 "manual",      \$MANUAL,
                 "version",     \$VERSION
               );
 
-    #
-    #  Now make ensure that the command line setting of '--lvm', '--evms', '--zpool'
-    # and '--dir=x' override anything specified in the configuration file.
-    #
-    if ( $install{ 'dir' } )
-    {
-        $CONFIG{ 'dir' }       = $install{ 'dir' };
-        $CONFIG{ 'evms' }      = undef;
-        $CONFIG{ 'lvm' }       = undef;
-        $CONFIG{ 'zpool' }     = undef;
-    }
-    if ( $install{ 'evms' } )
-    {
-        $CONFIG{ 'dir' }       = undef;
-        $CONFIG{ 'evms' }      = $install{ 'evms' };
-        $CONFIG{ 'lvm' }       = undef;
-        $CONFIG{ 'zpool' }     = undef;
-    }
-    if ( $install{ 'lvm' } )
-    {
-        $CONFIG{ 'dir' }       = undef;
-        $CONFIG{ 'evms' }      = undef;
-        $CONFIG{ 'lvm' }       = $install{ 'lvm' };
-        $CONFIG{ 'zpool' }     = undef;
-    }
-    if ( $install{ 'zpool' } )
-    {
-        $CONFIG{ 'dir' }       = undef;
-        $CONFIG{ 'evms' }      = undef;
-        $CONFIG{ 'lvm' }       = undef;
-        $CONFIG{ 'zpool' }     = $install{ 'zpool' };
-    }
-
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
 
@@ -359,17 +307,17 @@ sub checkArguments
     #
     #  When testing we only care about loopback images, not disk images.
     #
-    if ( $CONFIG{ 'test' } and ( $CONFIG{ 'lvm' } or $CONFIG{ 'evms' } or $CONFIG{ 'zpool' } ))
+    if ( $CONFIG{ 'test' } )
     {
-        print "Error: --test only works with --dir.\n";
+        $CONFIG{ 'lvm' }  = undef;
-        exit 1;
+        $CONFIG{ 'evms' } = undef;
     }
 
     #
     #  Make sure we got one and only one installation method.
     #
     my $count = 0;
-    foreach my $type (qw/dir lvm evms zpool/)
+    foreach my $type (qw/dir lvm evms/)
     {
         $count += 1 if defined( $CONFIG{ $type } );
     }
@@ -384,8 +332,7 @@ sub checkArguments
         print " --dir\n";
         print " --evms\n";
         print " --lvm\n";
-        print " --zpool\n";
+        exit;
-        exit 2;
     }
 }
 
@@ -529,37 +476,6 @@ sub deleteXenImage
             }
         }
 
-    }
-    elsif ( defined( $CONFIG{ 'zpool' } ) )
-    {
-
-        #
-        #  ZFS volumes
-        #
-        #
-        #  TODO: Check we're not mounted.
-        #
-
-        if ( -e "/dev/$CONFIG{'zpool'}/$hostname-swap" )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would remove ZFS swap volume /dev/$CONFIG{'zpool'}/$hostname-swap\n";
-            } else {
-                print "Removing swap volume\n";
-                runCommand("zfs destroy -R $CONFIG{'zpool'}/$hostname-swap", \%PER_HOST_CONFIG);
-            }
-        }
-
-        if ( -e "/dev/$CONFIG{'zpool'}/$hostname-disk" )
-        {
-            if ($CONFIG{ 'dry-run' }) {
-                print "Would remove ZFS disk volume /dev/$CONFIG{'zpool'}/$hostname-disk\n";
-            } else {
-                print "Removing ZFS disk volume\n";
-                runCommand("zfs destroy -R $CONFIG{'zpool'}/$hostname-disk", \%PER_HOST_CONFIG);
-            }
-        }
-
     }
     else
     {

bin/xen-list-images

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-list-images - List all the created and configured Xen images.
@@ -64,7 +62,7 @@ Show the version number and exit.
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
  Stéphane Jourdois
 
 
@@ -106,7 +104,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 
@@ -212,7 +210,7 @@ sub findXenInstances
 
 =begin doc
 
-  Show details about the Xen instance contained in the given
+  Show details about the the Xen instance contained in the given
  configuration file.
 
 =end doc
@@ -249,7 +247,7 @@ sub displayInstance
         {
             $name = $1;
         }
-        if ( $line =~ /^\s*memory[^0-9]*([0-9]+)/i )
+        if ( $line =~ /.*memory[^0-9]*([0-9]+)/i )
         {
             $mem = $1;
         }
@@ -264,7 +262,7 @@ sub displayInstance
     }
 
     print "Name: $name\n";
-    print "Memory: $mem MB\n";
+    print "Memory: $mem\n";
     print "IP: " . $ip . $mac . "\n" if length($ip);
     print "DHCP" . $mac . "\n" if $dhcp;
     print "Config: $file\n";

bin/xen-resize-guest

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-resize-guest - Resize a loopback or LVM based xen guest.
@@ -75,8 +73,8 @@ Show the version number and exit.
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
 
 
 =head1 LICENSE
@@ -111,7 +109,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 #
@@ -340,7 +338,7 @@ sub parseCommandLineArguments
 
     #
     #  Setup mutually exclusive options in such a way that
-    # they will allow the configuration values to be overridden by
+    # they will allow the configuration values to be overriden by
     # the command line.
     #
     if ( $install{ 'lvm' } )

bin/xen-update-image

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xen-update-image - Update the software installed upon offline Xen images.
@@ -75,8 +73,8 @@ Show the version number and exit.
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
 
@@ -113,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 #
@@ -149,13 +147,13 @@ checkArguments();
 #
 if ( $EFFECTIVE_USER_ID != 0 )
 {
-    print <<EOROOT;
+    print <<E_O_ROOT;
 
   This script is not running with root privileges.
 
   root privileges are required to successfully mount the disk image(s).
 
-EOROOT
+E_O_ROOT
 
     exit;
 }
@@ -302,7 +300,7 @@ sub updateXenImage
         #  Now upgrade
         #
         system(
-            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes"
+            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
         );
 
         #
@@ -344,52 +342,15 @@ sub parseCommandLineArguments
     my $MANUAL  = 0;
     my $VERSION = 0;
 
-    #
-    # We record the installation method here because we want
-    # to ensure that we allow the method supplied upon the command line
-    # to overwrite the one we might have ready read from the configuration
-    # file.
-    #
-    my %install;
-    $install{ 'evms' }      = undef;
-    $install{ 'dir' }       = undef;
-    $install{ 'lvm' }       = undef;
-
     #  Parse options.
     #
-    GetOptions( "dir=s",  \$install{ 'dir' },
+    GetOptions( "dir=s",  \$CONFIG{ 'dir' },
-                "lvm=s",   \$install{ 'lvm' },
+                "lvm=s",   \$CONFIG{ 'lvm' },
-                "evms=s", \$install{ 'evms' },
+                "evms=s", \$CONFIG{ 'evms' },
                 "help",    \$HELP,
                 "manual", \$MANUAL,
                 "version", \$VERSION );
 
-    #
-    #  Now make ensure that the command line setting of '--lvm', '--evms', '--zpool'
-    # and '--dir=x' override anything specified in the configuration file.
-    #
-    if ( $install{ 'dir' } )
-    {
-        $CONFIG{ 'dir' }       = $install{ 'dir' };
-        $CONFIG{ 'evms' }      = undef;
-        $CONFIG{ 'lvm' }       = undef;
-        $CONFIG{ 'zpool' }     = undef;
-    }
-    if ( $install{ 'evms' } )
-    {
-        $CONFIG{ 'dir' }       = undef;
-        $CONFIG{ 'evms' }      = $install{ 'evms' };
-        $CONFIG{ 'lvm' }       = undef;
-        $CONFIG{ 'zpool' }     = undef;
-    }
-    if ( $install{ 'lvm' } )
-    {
-        $CONFIG{ 'dir' }       = undef;
-        $CONFIG{ 'evms' }      = undef;
-        $CONFIG{ 'lvm' }       = $install{ 'lvm' };
-        $CONFIG{ 'zpool' }     = undef;
-    }
-
     pod2usage(1) if $HELP;
     pod2usage( -verbose => 2 ) if $MANUAL;
 

bin/xt-create-xen-config

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xt-create-config - Create a Xen configuration file for a new guest
@@ -99,8 +97,8 @@ xt-create-config - Create a Xen configuration file for a new guest
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
 
@@ -148,7 +146,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 
@@ -254,7 +252,7 @@ sub checkArguments
     if ( !-d $CONFIG{ 'output' } )
     {
         print
-          "The output directory we've been given, $CONFIG{'output'}, doesn't exist\n";
+          "The output directory we've been given, $CONFIG{'output'}, doesnt exist\n";
         print "Aborting\n";
         exit 1;
     }
@@ -369,24 +367,12 @@ sub createXenConfig
     #
     #  Remove any trailing Mb.
     #
-    $ENV{ 'memory' } =~ s/^(\d+)Mb?.*$/$1/i;
+    if ( $ENV{ 'memory' } =~ /^(\d+)Mb?.*$/i )
-
+    {
-    #
+        $ENV{ 'memory' } = $1;
-    #  The maxmem size:  Convert Gb -> Mb.
-    #
-    if ( exists($ENV{ 'maxmem' }) and defined($ENV{ 'maxmem' })) {
-
-        if ($ENV{ 'maxmem' } =~ /^(\d+)Gb?.*$/i )
-        {
-            $ENV{ 'maxmem' } = $1 * 1024;
-        }
-
-    #
-    #  Remove any trailing Mb.
-    #
-        $ENV{ 'maxmem' } =~ s/^(\d+)Mb?.*$/$1/i;
     }
 
+
     #
     # Images as presented to Xen - either loopback images, or LVM partitions.
     #

bin/xt-customize-image

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xt-customize-image - Customize a freshly installed copy of GNU/Linux
@@ -29,7 +27,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
 =head1 NOTES
 
   This script is invoked by xen-create-image after it has created a
- fresh installation of Linux within a temporary location.
+ fresh installation of Linux withing a temporary location.
 
   This script will be invoked with a full copy of the arguments from
  xen-create-image in its environment, along with several command line
@@ -54,20 +52,11 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
  executed from '/usr/share/xen-tools/foo.d'.  Each executable will
  be loaded and executed in sorted order.
 
-  The systems administrator can optionally provide site-specific
- revisions of those same hooks by placing them in the directory
- '/etc/xen-tools/hooks.d/' in which case a script with the same name
- as the one in the 'foo.d' directory above will take precedence. In
- this way certain hooks can be prevented from running, expanded with
- site-specific features which won't get overwritten on upgrades, or
- patched with critical bug-fixes before the upstream OS distribution
- provider reacts.
-
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
 
@@ -100,7 +89,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 
@@ -221,7 +210,7 @@ sub checkArguments
 
     if ( !-d $dir )
     {
-        print <<EOR;
+        print <<E_OR;
 
   We\'re trying to configure an installation of $CONFIG{'dist'} in
  $CONFIG{'location'} - but there is no hook directory for us to use.
@@ -231,7 +220,7 @@ sub checkArguments
   We\'d expect the hook directory to be : $dir
 
   Aborting.
-EOR
+E_OR
         exit 1;
     }
 
@@ -260,7 +249,6 @@ sub runDistributionHooks
     #  Hook directory.
     #
     my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
-    my $hooks_local = "/etc/xen-tools/hooks.d/";
 
     #
     #  Installation prefix
@@ -305,20 +293,10 @@ sub runDistributionHooks
                 $name = $2;
             }
 
-            #
-            # Run a local version of the hook instead of the system one,
-            # if the local one exists and is executable.
-            #
-            my $file_local = $hooks_local . $name;
-            if ( ( -x $file_local ) && ( -f $file_local ) )
-            {
-              $file = $file_local
-            }
-
             #
             # Complete command we're going to execute.
             #
-            my $cmd = $file . " $CONFIG{'location'}";
+            my $cmd = $hooks . $name . " $CONFIG{'location'}";
 
             #
             #  Run the command.  This has different prolog and epilog

bin/xt-guess-suite-and-mirror

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xt-guess-suite-and-mirror - Tries to guess the most suitable suite and
@@ -30,7 +28,7 @@ xen-create-image(1) or the backticks feature in xen-tools.conf.
 
 =head1 AUTHORS
 
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
  Stéphane Jourdois
 
 
@@ -52,9 +50,9 @@ full text of the license.
 # Fallback to Debian or Ubuntu in case we can't find anything
 my $fallback = 'Debian';
 
-# Which mirrors to use if everything else fails (deb.debian.org
+# Which mirrors to use if everything else fails (http.debian.net
 # redirects to a working mirror nearby)
-my %fallback_mirror = ( Debian => 'http://deb.debian.org/debian/',
+my %fallback_mirror = ( Debian => 'http://http.debian.net/debian/',
                         Ubuntu => 'http://archive.ubuntu.com/ubuntu/' );
 
 # Which suite to use if everything else fails. For Debian "stable"
@@ -62,7 +60,7 @@ my %fallback_mirror = ( Debian => 'http://deb.debian.org/debian/',
 # 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 => 'bionic' );
+                       Ubuntu => 'lucid' );
 
 # Where to look for the sources.list to parse
 my @sources_list_files = ( '/etc/apt/sources.list',
@@ -71,7 +69,6 @@ my @sources_list_files = ( '/etc/apt/sources.list',
 use File::Slurp;
 use Getopt::Long;
 use Pod::Usage;
-use File::Which;
 
 use strict;
 
@@ -79,7 +76,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 # Init
 my $mirror = '';
@@ -151,8 +148,10 @@ all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
 die "Couldn't find a useful entry in the sources.list files of the Dom0. Tried:\n  ".
     join("\n  ", @sources_list_files)."\n" unless $found;
 
-my $lsb_release = which('lsb_release');
+my $lsb_release = `which lsb_release`;
-if (!$found and defined($lsb_release) and -x $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') {

bin/xt-install-image

@@ -1,7 +1,5 @@
 #!/usr/bin/perl -w
 
-=encoding utf8
-
 =head1 NAME
 
 xt-install-image - Install a fresh copy of GNU/Linux into a directory
@@ -28,7 +26,6 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
                     configuration file.
    --mirror         The mirror to use when installing with 'debootstrap'.
    --apt_proxy      The proxy to use when installing with 'debootstrap'.
-   --keyring        The keyring to use when installing with 'debootstrap'.
 
   Installation Options:
    --install-method  Specify the installation method to use.
@@ -78,9 +75,9 @@ Untar a .tar file into the new installation location.  This tarfile is assumed t
 
 =head1 AUTHORS
 
- Steve Kemp, https://steve.fi/
+ Steve Kemp, http://www.steve.org.uk/
- Axel Beckert, https://axel.beckert.ch/
+ Axel Beckert, http://noone.org/abe/
- Dmitry Nedospasov, http://www.nedos.net/
+ Dmitry Nedospasov, http://nedos.net/
  Stéphane Jourdois
 
 
@@ -113,7 +110,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.9';
+my $RELEASE = '4.4~dev';
 
 
 #
@@ -338,7 +335,6 @@ sub parseCommandLineArguments
         "cachedir=s", \$CONFIG{ 'cachedir' },
         "config=s", \$CONFIG{ 'config' },
         "mirror=s", \$CONFIG{ 'mirror' },
-        "keyring=s", \$CONFIG{ 'keyring' },
         "apt_proxy=s", \$CONFIG{ 'apt_proxy' },
 
         # Help.
@@ -414,7 +410,7 @@ sub checkArguments
 
     if ( !-d $dir )
     {
-        print <<EOR;
+        print <<E_OR;
 
   We are trying to configure an installation of $CONFIG{'dist'} in
  $CONFIG{'location'} - but there is no hook directory for us to use.
@@ -424,7 +420,7 @@ sub checkArguments
   We would expect the hook directory to be $dir.
 
   Aborting.
-EOR
+E_OR
         exit 1;
     }
 
@@ -621,7 +617,7 @@ sub do_debootstrap
     }
 
     #
-    #  Propagate --verbose appropriately.
+    #  Propogate --verbose appropriately.
     #
     my $EXTRA = '';
     if ( $CONFIG{ 'verbose' } )
@@ -630,21 +626,13 @@ sub do_debootstrap
     }
 
     #
-    #  Propagate the --arch argument
+    #  Propogate the --arch argument
     #
     if ( $CONFIG{ 'arch' } )
     {
         $EXTRA .= " --arch $CONFIG{'arch'}";
     }
 
-    #
-    #  Propagate the --keyring argument
-    #
-    if ( $CONFIG{ 'keyring' } )
-    {
-        $EXTRA .= " --keyring=$CONFIG{'keyring'}";
-    }
-
     #
     #  Setup http_proxy so that debootstrap pulls files through the apt-proxy
     #
@@ -701,7 +689,7 @@ sub do_rinse
       "rinse --distribution=$CONFIG{'dist'} --directory=$CONFIG{'location'}";
 
     #
-    #  Propagate the --arch argument
+    #  Propogate the --arch argument
     #
     if ( $CONFIG{ 'arch' } )
     {
@@ -727,7 +715,7 @@ sub do_rinse
     }
 
     #
-    #  Propagate the verbosity setting.
+    #  Propogate the verbosity setting.
     #
     if ( $CONFIG{ 'verbose' } )
     {
@@ -751,7 +739,7 @@ sub do_rpmstrap
 {
 
     #
-    #  Propagate the verbosity setting.
+    #  Propogate the verbosity setting.
     #
     my $EXTRA = '';
     if ( $CONFIG{ 'verbose' } )
@@ -760,7 +748,7 @@ sub do_rpmstrap
     }
 
     #
-    #  Propagate any arch setting we might have.
+    #  Propogate any arch setting we might have.
     #
     if ( $CONFIG{ 'arch' } )
     {

debian/NEWS

@@ -1,19 +1,4 @@
-xen-tools (4.8-1) unstable; urgency=medium
+xen-tools (4.4~dev-1) UNRELEASED; urgency=low
-
-  For security reasons (avoid risk to circumvent ASLR), recent
-  kernels have disabled the vsyscall mapping. Unfortunately older
-  distributions don't run and hence can't be bootstrapped without it.
-
-  To enable trapping and enabling emulate calls into the fixed
-  vsyscall address mapping and hence to run and bootstrap older Linux
-  distributions in a chroot (as xen-tools does), you need to add
-  "vsyscall=emulate" to the kernel commandline, e.g. by adding it to
-  GRUB_CMDLINE_LINUX_DEFAULT in /etc/default/grub, then running
-  "update-grub" afterwards and finally reboot.
-
- -- Axel Beckert <abe@debian.org>  Thu, 07 Feb 2019 17:40:03 +0100
-
-xen-tools (4.4~beta1-1) unstable; urgency=low
 
   * Exported environment variables no more contain dashes ("-"). Dashes in
     environment variable names are from now on converted to underscores
@@ -26,7 +11,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
     which all should be empty at that point, i.e. "rmdir -p
     /usr/lib/xen-tools/*" should do the trick.
 
- -- Axel Beckert <abe@debian.org>  Fri, 23 Aug 2013 19:01:16 +0200
+ -- Axel Beckert <abe@debian.org>  Fri, 05 Apr 2013 20:19:02 +0200
 
 xen-tools (4.2~rc1-1) unstable; urgency=low
 
@@ -41,7 +26,7 @@ xen-tools (4.2~beta1-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 running "update-initramfs -u"
+  /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
@@ -54,3 +39,4 @@ xen-tools (4.2~beta1-1) unstable; urgency=low
   path ending in /debian/ there.
 
  -- Axel Beckert <abe@debian.org>  Sun, 30 May 2010 22:36:16 +0200
+

debian/README.source

@@ -4,7 +4,7 @@ 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://github.com/xen-tools/xen-tools.git
+$ git clone git://gitorious.org/xen-tools/xen-tools.git
 $ cd xen-tools
 
 If you just want to build the binary package, run
@@ -18,4 +18,5 @@ Debian or Ubuntu:
 $ make orig-tar-gz
 $ dpkg-buildpackage
 
- -- Axel Beckert <abe@debian.org>, Tue, 14 Jul 2015 18:35:38 +0200
+
+ -- Axel Beckert <abe@debian.org>, Mon, 13 Sep 2010 14:30:05 +0200

debian/changelog

@@ -1,348 +1,6 @@
-xen-tools (4.9-1) unstable; urgency=medium
+xen-tools (4.4~dev-1) UNRELEASED; urgency=low
-
-  * New upstream bugfix and minor feature release.
-    + Mark Debian 7 Wheezy and 8 Jessie as EoL.
-    + Update list of Ubuntu and Debian releases.
-    + distributions.conf: Fix typo in release name of future Debian 12
-      release (bookwork → bookworm).
-    + Actually install xen-resize-guest tool. (Thanks lintian for the
-      spare-manual-page warning!)
-    + Distinguish between those Debian releases using $dist/updates for
-      security updates and those who use $dist-security. Thanks Paul Wise!
-      (Closes: #972749)
-      - Add test for this; needs libtest-file-contents-perl as build-dep.
-    + Fix support for lvm_thin. Thanks to Andreas Sundstrom for the bug
-      report and patch! (Closes: #942244)
-    + Mount /proc and /dev before calling update-grub. Thanks to Brandon
-      Bradley for the bug report and patch. (Closes: #815021)
-    + Add Debian install rules for arm64. (GH #62; patch by Ian McLinden)
-    + Add netplan p2p support for Ubuntu. (GH #58; patch by Volker Janzen)
-    + Fix storage commandline options not overriding xen-tools.conf
-      settings also in xen-update-image and xen-delete-image. (GH #57;
-      patch by Volker Janzen)
-    + partitions/sample-server: Change options=sync to
-      options=defaults. (GL MR !1; patch by Wolfgang Karall)
-    + Start all Debian releases since Stretch (9) with pygrub by default.
-
-  * Recommend deboootstrap ≥ 1.0.117~ for working bootstrapping of Ubuntu
-    6.06 Dapper and 6.10 Edgy (see #659360) and for support of Ubuntu
-    17.10 Artful, 18.04 LTS Bionic, 18.10 Cosmic, 19.04 Disco, 19.10 Eoan,
-    and 20.04 Focal.
-  * Fix non-RFC-conforming four-letter day of week abbreviations in
-    ancient debian/changelog entries.
-  * Bump debian/watch version from 3 to 4. Thanks Lintian!
-  * Bump debhelper compatibility level to 13.
-    + Build-depend on "debhelper-compat (= 13)" to replace debian/compat.
-  * Declare compliance with Debian Policy 4.5.1. (No changes required.)
-  * Adapt distributions.conf defaults to the fact that Debian Unstable
-    still ships Ubuntu keyrings as of 2018, see #978438.
-
- -- Axel Beckert <abe@debian.org>  Tue, 29 Dec 2020 12:19:51 +0100
-
-xen-tools (4.8-1) unstable; urgency=medium
-
-  * New upstream release.
-
-    [ Marc Bigler ]
-    + Add support for ZFS volumes. (GH #50)
-
-    [ Yuri Sakhno ]
-    + Eliminate progress reporting which is useless in logs. (GH #42)
-
-    [ Axel Beckert ]
-    + Add preliminary support for future Debian 12 Bookworm release.
-    + Add support for Ubuntu releases from 17.10 Artful to 19.04 Disco.
-      - Create hooks/artful with new 40-setup-networking-deb-netplan by
-        Arno Bakker and Peter. (Fixes xen-tools/xen-tools#51)
-      - Rename hooks/karmic/80-install-kernel to
-        hooks/common/80-install-kernel-ubu and add according symlinks.
-    + Change all occurrences of httpredir.debian.org to deb.debian.org
-      except those for the debian-archive. The latter now point to
-      archive.debian.org directly.
-    + Set Ubuntu fallback suite to the latest LTS, i.e. 18.04 Bionic.
-    + Drop pygrub path detection from xm.tmpl, Xen prefers a path-less
-      bootloader='pygrub'.
-    + Many improvements for the release-testing script.
-    + Only run xen-toolstack helper script if both, xm and xl are
-      present. Avoids warning about deprecated helper script.
-    + distributions.conf now supports arbitrary keyring files in
-      /usr/share/keyrings/. (Needed for some EoL Ubuntu releases.)
-
-    [ Nico Boehr ]
-    + Add support for LVM thin provisioning.
-
-    [ Pietro Stäheli ]
-    + Add support for option --randommac for really random MAC addresses
-      upon every xen-create-image invocation. (Closes: #855703)
-
-  [ Axel Beckert ]
-  * Fix wrong bug number for #849867 in previous changelog entry.
-  * Declare compliance with Debian Policy 4.1.3.
-    + Change Priority from extra to optional.
-  * Use "$(MAKE)" instead of "make" in debian/rules.
-  * debian/control: Drop "Testsuite: autopkgtest" header, no more needed.
-  * Switch "activate" trigger to "activate-noawait".
-  * Recommend e2fsprogs. (Closes: #887236)
-  * Prefer btrfs-progs over now transitional package btrfs-tools. (Closes:
-    #878910)
-  * Bump debhelper compatibility level to 10.
-    + Update versioned debhelper build-dependency accordingly.
-    + Only using dh compat level 10 allows one to still build the package
-      on Debian 9 Stretch without backports, on Ubuntu 18.04 LTS and on
-      Ubuntu 16.04 LTS with backports.
-  * Declare compliance with Debian Policy 4.3.0. (No changes needed.)
-  * Set "Rules-Requires-Root: no".
-  * Check $DEB_BUILD_OPTIONS and $DEB_BUILD_PROFILES in
-    override_dh_auto_test. Fixes according lintian warning.
-  * Use ubuntu-keyring instead of now transitional ubuntu-archive-keyring,
-    but keep the latter as alternative to allow one to install the
-    xen-tools package also on older Debian or Ubuntu releases.
-  * Suggest grub-xen-host despite the proper support for it is not
-    finished.
-  * Add a note about "vsyscall=emulate" and older Linux distributions to
-    debian/NEWS. Thanks to James Clarke and Jason Crain for the hint!
-  * Add a DEP-12 debian/upstream/metadata file.
-
-  [ Jelmer Vernooij ]
-  * Trim trailing whitespace from debian/changelog. (GH #54)
-
- -- Axel Beckert <abe@debian.org>  Sat, 09 Feb 2019 01:56:51 +0100
-
-xen-tools (4.7-1) unstable; urgency=medium
 
   * New upstream release
-    + release-testing: Several enhancements, race condition avoidance, …
-    + Fixes reported error code in case of subcommand failure (Reported
-      and fixed by Yuri Sakhno, thanks!)
-    + Fixes typo found by lintian.
-    + Support for Ubuntu 16.10 Yakkety Yak.
-    + Preliminary support for Ubuntu 17.04 Zesty Zapus.
-    + Knows future Debian release names Buster (10) and Bullseye (11).
-    + Knows about Ubuntu's "devel" alias.
-    + Risen default values for RAM sizes in /etc/xen-tools/xen-tools.cfg
-      to cope with risen resource consumption and availability.
-      (Closes: #849867)
-    + Default file system is now ext4 (instead of ext3).
-    + Fixes inconsistent/non-functional handling of --nopygrub
-      parameter. Thanks Daniel Reichelt for the bug report and patch!
-      (Closes: #842609)
-    + Fixes possible missing gateway in generated
-      /etc/network/interfaces. (Closes: #764625)
-    + Support situations where distributions (e.g. Squeeze) might be EoL,
-      but its archive signing key is still not removed from the default
-      keyring.
-    + Workaround LVM related race condition when using --force with LVM.
-  * Declare compliance with Debian Policy 3.9.8. (No changes needed.)
-  * Use NEWS.markdown as upstream changelog, don't install it as docs.
-  * Switch many URLs (upstream and in packaging) to https:// and update
-    URLs where they were broken or redirect somewhere else now.
-  * Fix some typos in older debian/changelog and debian/NEWS items.
-
- -- Axel Beckert <abe@debian.org>  Mon, 23 Jan 2017 00:39:11 +0100
-
-xen-tools (4.6.2-1) unstable; urgency=medium
-
-  * New upstream bugfix release
-
-    [ Pierre Olivier ]
-    + Added /usr/local/bin/pygrub to the end of the pygrub search path.
-
-    [ nirgal ]
-    + Fixed typo in initramfs comment
-
-    [ Axel Beckert ]
-    + Make t/hooks-inittab.t using its own copy of the generic /etc/inittab
-      for testing instead of using the system one's. (GH#36, should fix
-      autopkgtest on systems with modified /etc/inittab)
-    + Fix unescaped braces (deprecated with Perl 5.22) in t/plugin-checks.t.
-
-  * Support checking upstream GPG signature in debian/watch.
-
- -- Axel Beckert <abe@debian.org>  Wed, 23 Dec 2015 18:05:54 +0100
-
-xen-tools (4.6.1-1) unstable; urgency=medium
-
-  * New upstream bugfix release
-    + Declare GitHub as primary hosting.
-    + Integrate BUGS.markdown into README.markdown, move remaining
-      contents of KNOWN_BUGS.markdown to the GitHub issue tracker.
-    + Fix Perl warning in t/hook-inittab.t if /etc/inittab isn't present.
-      - Fixes failed autopkgtest.
-    + Preliminary support for Ubuntu 16.04 LTS Xenial Xerus.
-    + Neither use $#array in boolean context nor @array = undef anymore.
-  * Update Vcs-* headers to point to GitHub instead of GitLab.
-  * Add debian/maintscript to remove obsolete conffile
-    /etc/bash_completion.d/xen-tools properly.
-  * Fix typo in previous changelog entry.
-
- -- Axel Beckert <abe@debian.org>  Sat, 24 Oct 2015 01:13:08 +0200
-
-xen-tools (4.6-1) unstable; urgency=low
-
-  * New upstream release
-    + Fix usage of nonexistent variable in removeDebianPackage (Closes:
-      #774936) Thanks Lukas Schwaighofer!
-    + Change all occurrences of http.debian.net to httpredir.debian.org
-    + Ubuntu 10.04 Lucid Lynx and 14.10 Utopic Unicorn now EoL.
-    + Preliminary support for Debian 9 Stretch and Ubuntu 15.10 Wily
-      Werewolf.
-    + Installs bash completion into /usr/share/bash-completion/ (fixes
-      lintian warning package-install-into-obsolete-dir)
-    + Allows # within configuration file comments. (Closes: #783060;
-      thanks Jean-Michel Nirgal Vourgère for the bug report and patch!)
-    + Testsuite: Let modules.sh ignore the .git directory. (t/modules.t
-      failed if a git commit message had a line starting with "use ".)
-    + Testsuite: Optimize and clean up modules.sh.
-    + Drop all occurrences of apt's --force-yes parameter. It only forces
-      the installation of untrusted packages and that's unwanted. (Closes:
-      #776487)
-    + Support passing commandline options with --debootstrap-cmd.
-    + Use -o APT::Install-Recommends=false instead of
-      --no-install-recommends for backwards compatibility with older APT
-      versions which don't know either (but accept any Foo=Bar parameter
-      to "-o"). Allows one to install earlier Debian releases (e.g. Etch)
-      with the default configuration again.
-    + Use md5 as default hash method again, to be able to properly set
-      passwords in older releases. Does not affect passwords changed later
-      inside the DomU.
-    + Split off hardcoded release code names list and default mirrors in
-      xen-create-image into separate configuration file which is parsed
-      before the default settings or command-line options are set.
-    + Pass --yes to lvcreate only if LVM version is 2.02.99 or
-      higher. Fixes regression introduced with 4.5 by the fix for #754517.
-      - Add new (build-)dependency on libsort-versions-perl.
-    + Report all SSH fingerprints of the created DomU, not only RSA ones.
-    + Split up test suite in functionality/compatibility tests (t) and
-      author/release tests (xt).
-    + Make test suite support as-installed-testing
-      - Mark package as autopkgtestable.
-    + Multiple release workflow improvements (target release in Makefile):
-      - Use TMPDIR instead of TMP for temporary directories.
-      - Always run the full test suite before doing a release.
-      - Use maximum compression and don't store time stamps in tar ball.
-      - Make "release" target to include "orig-tar-gz" and tagging.
-    + New option --keyring which is passed through to deboootstrap. Its
-      default values work around bug #792729 in debootstrap.
-    + Supports "unstable", "oldstable" and "oldoldstable" as distribution
-      names, too. ("oldoldstable" is not yet supported by debootstrap, see
-      feature request #792734 in debootstrap.)
-    + New example script helpful for release testing.
-    + Support VLANs with Open vSwitch (GH-2). Thanks to Félix Barbeira
-      for the patch.
-  * Update Vcs-* headers and documentation as Gitorious closed its doors
-    in June 2015 and is now only available with static contents.
-  * Recommend debian-archive-keyring (for installing Debian DomUs on
-    derivatives) and ubuntu-archive-keyring (for installing Ubuntu DomUs
-    on Debian).
-  * Reduce the list of alternative xen-hypervisor-* packages to just
-    "xen-hypervisor" which is a virtual package provided by at least all
-    xen-hypervisor-* packages since Debian 6 Squeeze.
-  * Recommend lvm2, it's at least required if the --lvm option is used.
-  * Add an adequate as-installed test to debian/tests/control.
-
- -- Axel Beckert <abe@debian.org>  Mon, 20 Jul 2015 16:05:04 +0200
-
-xen-tools (4.5-1) unstable; urgency=low
-
-  * New upstream release
-    + Use "686-pae" kernels instead of "686" kernels on Debian Wheezy and
-      later. Thanks to Daniel Lintott! (Closes: #742778)
-    + Pass "-y" option ("assume yes") to yum (Closes: #735675)
-      Thanks Lionel FÉLICITÉ!
-    + Drop all xend related sanity checks, they cause more havoc nowadays
-      than they help. Thanks Ian Campbell! (Closes: #732456)
-    + Apply patch by Adrian C. (anrxc) to allow to override hooks in
-      /usr/share/xen-tools/*.d/ with hooks in /etc/xen-tools/hooks.d/.
-      Thanks! (Also add /etc/xen-tools/hooks.d/ to debian/dirs.)
-    + Ignore cover_db directory in t/perl-syntax.t.
-    + Update list of supported Ubuntu releases.
-      - Add support for Ubuntu 14.10 Utopic Unicorn.
-      - Add preliminary support for Ubuntu 15.04 Vivid Vervet.
-      - Use old-releases.ubuntu.com for Ubuntu 13.10 Saucy Salamander.
-    + Fix always empty gateway on Debian DomUs (Thanks Joan! LP: #1328794)
-    + pygrub detection: Prefer /usr/lib/xen-default over /usr/lib/xen-x.y.
-    + Fix lvcreate awaiting user input when creating swap lv (Closes: #754517)
-      Thanks Eric Engstrom!
-    + Fix missing quoting in shell function "assert" in hooks/common.sh.
-    + Fix initial configuration summary in cases where pygrub is used.
-    + Fix corner cases where not the latest kernel would have been checked.
-    + --password overrides --genpass. (Closes: #764143) Based on patch by
-      Santiago Vila.
-    + Add password length sanity check with fallback to default length.
-    + Raise default password length from 8 to 23.
-    + Flush output after each line in runCommand().
-    + Makefile: Clean up coverage data in multiple targets.
-    + t/perl-syntax.t: Ignore changelog files, too.
-
-    [ Santiago Vila ]
-    + Fix unaligned maxmem output of xen-create-image. (Closes: #764126)
-    + Fix copy & paste errors in comments in typos in roles/puppet
-      (Closes: #764134)
-    + Fix typos in POD of xen-create-image (Closes: #764153)
-  * Bump Standards-Version to 3.9.6 (no changes needed)
-  * Fix lintian warning depends-on-perl-modules.
-  * Add lintian override for debian-news-entry-uses-asterisk; I disagree.
-
- -- Axel Beckert <abe@debian.org>  Sat, 25 Oct 2014 23:27:18 +0200
-
-xen-tools (4.4-1) unstable; urgency=low
-
-  * New upstream release
-    - Run t/gitignore.t only if git is installed and .git present.
-    - Rework "minimal" role to be less based on personal preferences.
-      + No more installs sudo, vim, syslog-ng, etc.
-      + Fixes usage together with pygrub.
-    - hooks/common.sh: Split up installDebianPackage into
-      installDebianPackage and installDebianPackageAndRecommends.
-  * Also add build-dependency on "libterm-ui-perl | perl (<< 5.17.0)" and
-    "liblog-message-perl | perl (<< 5.17.0)" to avoid warnings with Perl
-    5.18 and future FTBFS.
-  * Mention Ubuntu 14.04 Trusty Tahr in long description.
-
- -- Axel Beckert <abe@debian.org>  Wed, 11 Dec 2013 20:59:06 +0100
-
-xen-tools (4.4~rc1-1) unstable; urgency=low
-
-  * New upstream release candidate
-    - Also switch from cdn.debian.net to http.debian.net in xen-tools.conf
-    - Do not run "passwd" via runCommand as that one captures STDOUT for
-      logging. Makes --passwd usable again. Thanks to Christian Herzog for
-      the bug report.
-    - Loop around calling "passwd" to get a second chance to change the
-      password. (Closes: #703159) Thanks to Joan <aseques@gmail.com> for a
-      bug fix in this new code.
-      + Add dependency on "libterm-ui-perl | perl (<< 5.17.0)"
-    - Declares one more POD encoding and recode Xen::Tools::Common to
-      UTF-8. Fixes FTBFS with Perl 5.18. (Finally closes: #720519)
-    - Apply patch by Philipp Erbelding to fix overzealous line matching in
-      xen-list-images. (Gitorious merge request #5)
-    - xen-list-images now displays a unit after the memory size
-    - Drop support for memory size in kilobytes in xen-create-image,
-      neither xt-create-xen-config nor xm support it.
-    - Refactoring: Replace all occurrences of "! -z" by "-n" in hooks and
-      bash completion.
-    - Handle potentially empty gateway setting properly in
-      hooks/common/40-setup-networking-deb. Thanks Simone Caruso!
-    - Reformat hooks/common/40-setup-networking-deb so that the result
-      neither has trailing whitespace nor broken indentation.
-    - Also display MAC address after the DomU has been created.
-    - Preliminary support for Ubuntu 14.04 Trusty Tahr.
-    - Added --maxmem flag to set a maximum value for dynamic memory
-      ballooning. Thanks to Joan <aseques@gmail.com> for the patch!
-    - Added fix by Patryk Ściborek againsat disableStartStopDaemon()
-      aborting under some circumstances. (Closes: #725192)
-    - Abort early and with proper error message if "xen-delete-image
-      --test" is not used with "--dir". (Closes: #704878)
-    - xen-delete-image: Exit with return code != 0 in all error cases.
-    - Refactoring: xt-create-xen-config: Use s/// to strip trailing MB
-      size suffixes.
-  * Bump Standards-Version to 3.9.5 (no changes).
-
- -- Axel Beckert <abe@debian.org>  Mon, 28 Oct 2013 22:31:03 +0100
-
-xen-tools (4.4~beta1-1) unstable; urgency=low
-
-  * New upstream beta release
     - Code deduplication to unify the xen-*-image scripts
     - Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/
     - Use http.debian.net as default Debian mirror if no mirror is given
@@ -362,17 +20,14 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
     - Fixes "--extension=" with empty parameter.
     - Sarge amd64 case handle properly
     - Remove CVS revisions from --version output
-    - Support for Debian Jessie, Ubuntu Raring and preliminary support for
+    - Preliminary support for Debian Jessie and Ubuntu Raring
-      Ubuntu Saucy (debootstrap doesn't have support for Saucy at the time
-      of writing)
     - Preliminary support for xl toolstack
     - xen-create-image: Consistently use runCommand() instead of system()
     - xt-install-image: Don't bail out if only cdebootstrap is installed
       but not debootstrap (Thanks Elmar Heeb!)
     - Makefile accepts DESTDIR=…
     - Move examples from debian/examples to examples.
-    - Uses File::Which exclusively (no more findBinary, no more `which`),
+    - Uses File::Which, added (build-) dependency on libfile-which-perl
-      added (build-) dependency on libfile-which-perl
     - Knows about module-init-tools → kmod transition in wheezy/raring.
     - Adds default mount options for ext4, identical to ext2/ext3.
     - Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0
@@ -386,8 +41,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
       Add installCentOS4Package wrapper for backward compatibility.
     - Fix filesystem tools installation in 91-install-fs-tools (which was
       broken since 4.3~rc1-1) by merging 91-install-fs-tools back into
-      90-make-fstab. (Closes: #715340) Also supports RPM-based
+      90-make-fstab. Also supports RPM-based distributions now.
-      distributions now.
     - Fixes export of environment variables. Previously they could contain
       dashes and then were only accessible from within Perl, but not from
       within Bash.
@@ -397,15 +51,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
     - Removes unused Perl modules Xen::Tools and Xen::Tools::Log from
       source code. Also removes the according tests from the test suite.
       → Remove no more needed build-dependency on Moose.
-    - Better documents and checks requirements for the --apt_proxy
+  * Add debian/gbp.conf to be able to to build xen-tools with
-      value. (See #623443 for the corresponding apt issue.) Add (build-)
-      dependency on libdata-validate-uri-perl.
-    - Use Data::Validate::{Domain,IP} for IP addresses and hostname checks.
-      Add corresponding (build-) dependencies on
-      libdata-validate-{domain,ip}-perl.
-    - Fixes broken quoting in list of required binaries
-    - Declares POD encoding. Fixes FTBFS with Perl 5.18. (Closes: #720519)
-  * Add debian/gbp.conf to be able to build xen-tools with
     git-buildpackage.
   * Clean up debian/rules:
     - Don't mention (generated) upstream changelog explicitly,
@@ -416,14 +62,10 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
       dh_auto_* can't help. No more explicitly call "make manpages", it's
       a depedency of "make install" in the next line anyway.
     - Finally switch to a minimal dh style debian/rules.
-  * Bump debhelper compatibility to 9
-    - Update versioned debhelper build-dependency
-  * Bump Standards-Version to 3.9.4 (no changes)
-  * Add dependency on ${perl:Depends} to fix dpkg-gencontrol warning.
   * Bump copyright years in debian/copyright.
   * Apply wrap-and-sort.
 
- -- Axel Beckert <abe@debian.org>  Fri, 23 Aug 2013 19:00:03 +0200
+ -- Axel Beckert <abe@debian.org>  Thu, 17 Jan 2013 17:09:02 +0100
 
 xen-tools (4.3.1-1) unstable; urgency=low
 
@@ -693,7 +335,7 @@ xen-tools (3.9-3) unstable; urgency=medium
 xen-tools (3.9-2) unstable; urgency=high
 
   - Ensure that the hook scripts which setup networking details for
-    Debian & Ubuntu guests will correctly setup the broadcast address.
+    Debian & Ubuntu guests will correctly setup teh broadcast address.
 
  -- Steve Kemp <skx@debian.org>  Wed, 20 Feb 2007 21:22:23 +0000
 
@@ -827,7 +469,7 @@ xen-tools (3.1-1) unstable; urgency=low
   [ Steve Kemp ]
   * New upstream release v3.1.
     - Installation of packages in hooks works. (Closes: #402889, #404518)
-    - Xen configuration files are not accidentally trashed.  (Closes: #404443)
+    - Xen configuration files are not accidently trashed.  (Closes: #404443)
     - Hooks are now optional.  (Closes: #404444)
     - Better error handling of image creation. (Closes: #404455, #404516)
     - Avoid copying needless kernel modules to guests.  (Closes: #404508)
@@ -1030,7 +672,7 @@ xen-tools (2.1-2) unstable; urgency=high
     - Fixed several typos in the configuration file, and scripts.
       (Closes: #375382)
 
- -- Steve Kemp <skx@debian.org>  Thu, 29 Jun 2006 10:31:23 +0000
+ -- Steve Kemp <skx@debian.org>  Thur, 29 Jun 2006 10:31:23 +0000
 
 xen-tools (2.1-1) unstable; urgency=high
 
@@ -1044,7 +686,7 @@ xen-tools (2.1-1) unstable; urgency=high
   * Urgency set to high primarily because of the failure to create
     swap devices.
 
- -- Steve Kemp <skx@debian.org>  Thu, 23 Jun 2006 10:08:32 +0000
+ -- Steve Kemp <skx@debian.org>  Thur, 23 Jun 2006 10:08:32 +0000
 
 xen-tools (2.0-1) unstable; urgency=low
 
@@ -1175,3 +817,4 @@ xen-tools (0.4-1) unstable; urgency=low
   * Initial release (Closes: #344081)
 
  -- Radu Spineanu <radu@debian.org>  Tue, 20 Dec 2005 02:21:05 +0200
+

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -1,57 +1,37 @@
 Source: xen-tools
 Section: utils
-Priority: optional
+Priority: extra
 Maintainer: Axel Beckert <abe@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper (>= 7.0.0),
                devscripts,
                git,
-               libdata-validate-domain-perl,
-               libdata-validate-ip-perl,
-               libdata-validate-uri-perl,
                libfile-slurp-perl,
                libfile-which-perl,
-               liblog-message-perl | perl (<< 5.17.0),
-               libterm-ui-perl | perl (<< 5.17.0),
-               libsort-versions-perl,
-               libtest-file-contents-perl,
                libtest-notabs-perl,
                libtest-pod-coverage-perl,
                libtest-pod-perl,
                libtext-template-perl
-Standards-Version: 4.5.1
+Standards-Version: 3.9.3
-Homepage: https://xen-tools.org/software/xen-tools
+Homepage: http://xen-tools.org/software/xen-tools
-Vcs-Browser: https://github.com/xen-tools/xen-tools
+Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
-Vcs-Git: https://github.com/xen-tools/xen-tools.git
+Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
-Rules-Requires-Root: no
 
 Package: xen-tools
 Architecture: all
 Depends: debootstrap | cdebootstrap,
          libconfig-inifiles-perl,
-         libdata-validate-domain-perl,
-         libdata-validate-ip-perl,
-         libdata-validate-uri-perl,
          libfile-slurp-perl,
          libfile-which-perl,
-         libsort-versions-perl,
-         libterm-ui-perl | perl (<< 5.17.0),
          libtext-template-perl,
          openssh-client,
-         perl,
+         perl-modules,
-         ${misc:Depends},
+         ${misc:Depends}
-         ${perl:Depends}
+Recommends: libexpect-perl,
-Recommends: debian-archive-keyring,
-            debootstrap (>= 1.0.117~),
-            e2fsprogs,
-            libexpect-perl,
-            lvm2,
             rinse (>= 1.9.1-1),
-            ubuntu-keyring | ubuntu-archive-keyring,
+            xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae,
-            xen-hypervisor,
             xen-utils
-Suggests: btrfs-progs | btrfs-tools,
+Suggests: btrfs-tools,
           cfengine2,
-          grub-xen-host,
           reiserfsprogs,
           xfsprogs
 Description: Tools to manage Xen virtual servers
@@ -66,13 +46,7 @@ Description: Tools to manage Xen virtual servers
    * Debian 4.0 Etch
    * Debian 5.0 Lenny
    * Debian 6.0 Squeeze
-   * Debian 7 Wheezy
+   * Debian 7.0 Wheezy
-   * Debian 8 Jessie
-   * Debian 9 Stretch
-   * Debian 10 Buster
-   * Debian 11 Bullseye (under development)
-   * Debian 12 Bookworm (knows about this future release name)
-   * Debian 13 Trixie (knows about this future release name)
    * Debian Sid (Unstable)
    * Ubuntu 6.06 Dapper Drake (LTS)
    * Ubuntu 6.10 Edgy Eft
@@ -87,23 +61,5 @@ Description: Tools to manage Xen virtual servers
    * Ubuntu 11.04 Natty Narwhal
    * Ubuntu 11.10 Oneiric Ocelot
    * Ubuntu 12.04 Precise Pangolin (LTS)
-   * Ubuntu 12.10 Quantal Quetzal
-   * Ubuntu 13.04 Raring Ringtail
-   * Ubuntu 13.10 Saucy Salamander
-   * Ubuntu 14.04 Trusty Tahr (LTS)
-   * Ubuntu 14.10 Utopic Unicorn
-   * Ubuntu 15.04 Vivid Vervet
-   * Ubuntu 15.10 Wily Werewolf
-   * Ubuntu 16.04 Xenial Xerus (LTS)
-   * Ubuntu 16.10 Yakkety Yak
-   * Ubuntu 17.04 Zesty Zapus
-   * Ubuntu 17.10 Artful Aardvark
-   * Ubuntu 18.04 Bionic Beaver (LTS)
-   * Ubuntu 18.10 Cosmic Cuttlefish
-   * Ubuntu 19.04 Disco Dingo
-   * Ubuntu 19.10 Eoan Ermine
-   * Ubuntu 20.04 Focal Fossa (LTS)
-   * Ubuntu 20.10 Groovy Gorilla
-   * Ubuntu 21.04 Hirsute Hippo (preliminary support, under development)
    * CentOS 5
    * CentOS 6

debian/copyright

@@ -1,7 +1,7 @@
 This package was debianized by Radu Spineanu <radu@debian.org> on
 Tue, 20 Dec 2005 02:21:05 +0200.
 
-It was downloaded from https://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 2010-2013: The Xen-Tools Development Team, currently consisting of:
@@ -25,15 +25,3 @@ Perl is distributed under licenses:
     On Debian GNU/Linux systems, the complete text of the GNU General
     Public License can be found in /usr/share/common-licenses/GPL-1' and
     the Artistic Licence in /usr/share/common-licenses/Artistic'.
-
-t/data/inittab is Copyright 1997-2005 Miquel van Smoorenburg
-<miquels@cistron.nl> and the members pkg-sysvinit project.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License version 2 can be found in
-    /usr/share/common-licenses/GPL-2'.

debian/dirs

@@ -1,5 +1,4 @@
 /etc/xen-tools
 /etc/xen-tools/role.d
-/etc/xen-tools/hooks.d
 /etc/xen-tools/skel
-/usr/share/xen-tools
+/usr/share/xen-tools

debian/docs

@@ -1,4 +1,7 @@
 AUTHORS
 README.markdown
 SUPPORT.markdown
+BUGS.markdown
 TODO.markdown
+KNOWN_BUGS.markdown
+NEWS.markdown

debian/lintian-overrides

@@ -1,2 +0,0 @@
-# I disagree
-xen-tools: debian-news-entry-uses-asterisk

debian/maintscript

@@ -1 +0,0 @@
-rm_conffile /etc/bash_completion.d/xen-tools 4.6.1-1~

debian/rules

@@ -5,12 +5,4 @@
 %:
 	dh $@
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-	$(MAKE) non-author-test
-endif
-
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS.markdown
-
 override_dh_auto_build:

debian/tests/adequate

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-adequate xen-tools >&2

debian/tests/control

@@ -1,5 +0,0 @@
-Tests: functionality
-Depends: @, @builddeps@
-
-Tests: adequate
-Depends: @, adequate

debian/tests/functionality

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-export AS_INSTALLED_TESTING=1
-
-prove -j1 -v \
- t/hook-daemons.t \
- t/hook-hostname.t \
- t/hook-inittab.t \
- t/hook-tls.t \
- t/hooks.t \
- t/plugin-checks.t \
- t/pod-check.t \
- t/xen-delete-image.t \
- t/xen-lists-images.t \
- t/xt-create-xen-config.t

debian/triggers

@@ -1 +1 @@
-activate-noawait update-initramfs
+activate update-initramfs

debian/upstream/metadata

@@ -1,12 +0,0 @@
-%YAML 1.1
----
-# https://wiki.debian.org/UpstreamMetadata
-Bug-Database: https://github.com/xen-tools/xen-tools/issues
-Bug-Submit: https://github.com/xen-tools/xen-tools/issues/new
-Changelog: https://github.com/xen-tools/xen-tools/blob/master/NEWS.markdown
-Contact: mailto:xen-tools-discuss@xen-tools.org
-Security-Contact: mailto:abe@debian.org
-Name: Xen-Tools
-Homepage: https://xen-tools.org/
-Repository: https://github.com/xen-tools/xen-tools.git
-Repository-Browse: https://github.com/xen-tools/xen-tools

debian/upstream/signing-key.asc

@@ -1,147 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-+XwhySae
-=CO5C
------END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -4,13 +4,12 @@
 #
 #  uscan version number - not the version of the software.
 #
-version=4
+version=3
 
 
 #
 #  The link to the download location, followed by the regular expression
 # to match release tarballs.
 #
-opts=pgpsigurlmangle=s/$/.asc/ \
+http://xen-tools.org/software/xen-tools/releases.html \
-https://xen-tools.org/software/xen-tools/releases.html \
    xen-tools-([\d\.]+)\.tar\.gz

etc/distributions.conf

@@ -1,65 +0,0 @@
-# xen-tools configuration file for distribution meta data
-#
-# Syntax:
-#
-# codename = distribution and further keywords
-#
-# Known distributions: debian, ubuntu
-# Known keywords: eol, pygrub, default-keyring, dont-test
-# Known generic keywords: *.gpg (uses the according /usr/share/keyrings/….gpg file)
-#
-sarge        = debian eol
-etch         = debian eol
-lenny        = debian eol
-squeeze      = debian eol default-keyring
-wheezy       = debian eol
-jessie       = debian eol
-stretch      = debian pygrub
-buster       = debian pygrub
-bullseye     = debian pygrub
-bookworm     = debian pygrub dont-test
-trixie       = debian pygrub dont-test
-sid          = debian pygrub
-
-testing      = debian pygrub
-oldoldstable = debian dont-test
-oldstable    = debian pygrub
-stable       = debian pygrub
-unstable     = debian pygrub
-
-# Between at least debootstrap 1.0.37 and 1.0.93 (including), dapper
-# and edgy may need manual adjustments in debootstrap's configuration,
-# see https://bugs.debian.org/659360
-dapper       = ubuntu eol
-edgy         = ubuntu eol
-feisty       = ubuntu eol
-gutsy        = ubuntu eol
-hardy        = ubuntu eol
-intrepid     = ubuntu eol
-jaunty       = ubuntu eol
-karmic       = ubuntu eol
-lucid        = ubuntu eol pygrub
-maverick     = ubuntu eol pygrub
-natty        = ubuntu eol pygrub
-oneiric      = ubuntu eol pygrub
-precise      = ubuntu     pygrub ubuntu-archive-removed-keys.gpg
-quantal      = ubuntu eol pygrub
-raring       = ubuntu eol pygrub
-saucy        = ubuntu eol pygrub
-trusty       = ubuntu     pygrub
-utopic       = ubuntu eol pygrub
-vivid        = ubuntu eol pygrub
-wily         = ubuntu eol pygrub
-xenial       = ubuntu     pygrub
-yakkety      = ubuntu eol pygrub
-zesty        = ubuntu eol pygrub ubuntu-keyring-2012-archive.gpg
-artful       = ubuntu eol pygrub ubuntu-archive-keyring.gpg
-bionic       = ubuntu     pygrub
-cosmic       = ubuntu eol pygrub ubuntu-archive-keyring.gpg
-disco        = ubuntu eol pygrub ubuntu-archive-keyring.gpg
-eoan         = ubuntu eol pygrub ubuntu-archive-keyring.gpg
-focal        = ubuntu     pygrub
-groovy       = ubuntu     pygrub
-hirsute      = ubuntu     pygrub
-
-devel        = ubuntu     pygrub dont-test

etc/mirrors.conf

@@ -1,13 +0,0 @@
-# xen-tools default mirror configuration file
-
-debian =         http://deb.debian.org/debian
-debian_archive = http://archive.debian.org/debian
-
-ubuntu =         http://archive.ubuntu.com/ubuntu
-ubuntu_archive = http://old-releases.ubuntu.com/ubuntu
-
-#
-# If you like, you can also declare per-release mirrors:
-#
-# sarge  = http://debian.ethz.ch/debian-archive/debian
-# trusty = http://ubuntu.ethz,ch/ubuntu

etc/xen-tools.conf

@@ -7,7 +7,7 @@
 #
 #  For more details please see:
 #
-#        https://xen-tools.org/
+#        http://xen-tools.org/
 #
 ##
 
@@ -54,14 +54,6 @@
 ##
 # lvm = vg0
 
-#
-##
-#
-# If you have ZFS available and wish to use it then you may specify a
-# ZFS pool name here instead
-#
-##
-# zpool = xenpool0
 
 #
 ##
@@ -134,11 +126,10 @@ install-method = debootstrap
 ##
 #
 size   = 4G       # Root disk, suffix (G, M, k) required
-memory = 256M     # Suffix (G, M, k) required
+memory = 128M     # Suffix (G, M, k) required
-#maxmem = 2G      # Suffix (G, M, k) optional
+swap   = 128M     # Suffix (G, M, k) required
-swap   = 512M     # Suffix (G, M, k) required
 # noswap = 1      # Don't use swap at all for new systems.
-fs     = ext4     # Default file system for any disk
+fs     = ext3     # Default file system for any disk
 dist   = `xt-guess-suite-and-mirror --suite`
                   # Default distribution is determined by Dom0's distribution
 image  = sparse   # Specify sparse vs. full disk images (file based images only)
@@ -178,7 +169,7 @@ image  = sparse   # Specify sparse vs. full disk images (file based images only)
 #
 
 #
-# Setup bridge name for host vif. Useful if you use bridged networking
+# Setup bridge name for host vif. Usefull if you use bridged networking
 # for guests.
 #
 # bridge = xendmz
@@ -262,9 +253,44 @@ initrd = /boot/initrd.img-`uname -r`
 #
 
 #
-# Use the mirror configured on the DomU as default mirror
+# The default mirror for debootstrap to install Debian-derived distributions
 #
-# mirror = `xt-guess-suite-and-mirror --mirror`
+mirror = `xt-guess-suite-and-mirror --mirror`
+
+#
+# A mirror suitable for use when installing the Dapper release of Ubuntu.
+#
+# mirror = http://gb.archive.ubuntu.com/ubuntu/
+
+#
+#  If you like you could use per-distribution mirrors, which will
+# be more useful if you're working in an environment where you want
+# to regularly use multiple distributions. The following are the
+# default values used (for Debian the GeoIP feature is used, see
+# http://wiki.debian.org/DebianGeoMirror):
+#
+# mirror_sarge = http://archive.debian.org/debian
+# mirror_etch = http://archive.debian.org/debian
+# mirror_lenny = http://archive.debian.org/debian
+# mirror_squeeze = http://cdn.debian.net/debian
+# mirror_wheezy = http://cdn.debian.net/debian
+# mirror_jessie = http://cdn.debian.net/debian
+# mirror_sid = http://cdn.debian.net/debian
+# mirror_dapper = http://old-releases.ubuntu.com/ubuntu
+# mirror_edgy = http://old-releases.ubuntu.com/ubuntu
+# mirror_feisty = http://old-releases.ubuntu.com/ubuntu
+# mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
+# mirror_hardy = http://archive.ubuntu.com/ubuntu
+# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
+# mirror_jaunty = http://old-releases.ubuntu.com/ubuntu
+# mirror_karmic = http://old-releases.ubuntu.com/ubuntu
+# mirror_lucid = http://archive.ubuntu.com/ubuntu
+# mirror_maverick = http://old-releases.ubuntu.com/ubuntu
+# mirror_natty = http://old-releases.ubuntu.com/ubuntu
+# mirror_oneiric = http://archive.ubuntu.com/ubuntu
+# mirror_precise = http://archive.ubuntu.com/ubuntu
+# mirror_quantal = http://archive.ubuntu.com/ubuntu
+# mirror_raring = http://archive.ubuntu.com/ubuntu
 
 # If this is defined it will be used by debootstrap, and configured as the
 # proxy for the guest

etc/xm-nfs.tmpl

@@ -17,11 +17,6 @@
   }
 }
 memory  = '{$memory}'
-{ if ( $maxmem )
-  {
-    $OUT .= "maxmem      = '$maxmem'\n";
-  }
-}
 
 
 # Name

etc/xm.tmpl

@@ -20,16 +20,23 @@
 {
   if ( $pygrub )
   {
-    $OUT .= "bootloader = 'pygrub'\n";
+    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}'
-{ if ( $maxmem )
-  {
-    $OUT .= "maxmem      = '$maxmem'\n";
-  }
-}
 
 #
 #  Disk device(s).
@@ -139,12 +146,6 @@ name        = '{$hostname}'
       $br = ",bridge=$bridge"
     }
 
-    my $vl = '';
-    if ( $vlan )
-    {
-      $vl = ".$vlan"
-    }
-
     $OUT .= "vif         = [ 'ip=$ips";
     $OUT .= "$m";
     $OUT .= "$vn";

examples/release-testing

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -e
-
-exec 2>&1
-exec > >( tee xen-tools-release-testing-$(date -Iseconds).log )
-
-if [ -z "$DISTRIBUTIONS" ]; then
-    DISTRIBUTIONS=$(awk '!/^#|^$|dont-test/ {print $1}' /etc/xen-tools/distributions.conf)
-fi
-
-echo Deleting old release-testing artefacts
-for dist in $DISTRIBUTIONS; do
-    echo "*** Removing potential xen-tools-release-testing-$dist..."
-    xen-delete-image --verbose --hostname "xen-tools-release-testing-$dist"
-done
-
-echo Syncing...
-sync
-seconds=10
-printf "Sleeping for %i seconds to avoid LVM race conditions: " $seconds
-for i in $(seq 1 $seconds); do sleep 1; printf "%i " $i; done; printf '\n';
-
-SUCCEEDED=''
-FAILED=''
-
-# From now on we just want to log failures, not abort.
-set +e
-
-for dist in $DISTRIBUTIONS; do
-    echo "*** Creating xen-tools-release-testing-$dist..."
-    xen-create-image --verbose --hostname "xen-tools-release-testing-$dist" --dist $dist --force "$@"
-
-    if [ "$?" -eq '0' ]; then
-        SUCCEEDED="$dist $SUCCEEDED"
-    else
-        FAILED="$dist $FAILED"
-    fi
-done
-
-echo ''
-echo '======================================================================'
-if [ -z "$FAILED" ]; then
-    echo '*** All tests succeeded! ***'
-elif [ -z "$SUCCEEDED" ]; then
-    echo '*** All tests failed! ***'
-else
-    echo "*** These distributions succeeded: $SUCCEEDED ***"
-    echo "*** These distributions failed: $FAILED ***"
-fi

hooks/artful/01-disable-daemons

@@ -1 +0,0 @@
-../common/01-disable-daemons

hooks/artful/05-shadowconfig-on

@@ -1 +0,0 @@
-../common/05-shadowconfig-on

hooks/artful/15-disable-hwclock

@@ -1 +0,0 @@
-../common/15-disable-hwclock

hooks/artful/20-setup-apt

@@ -1 +0,0 @@
-../common/20-setup-apt

hooks/artful/25-generate-locale

@@ -1 +0,0 @@
-../common/25-generate-locale

hooks/artful/30-disable-gettys

@@ -1 +0,0 @@
-../common/30-disable-gettys

hooks/artful/35-setup-users

@@ -1 +0,0 @@
-../common/35-setup-users

hooks/artful/40-setup-networking-deb-netplan

@@ -1,147 +0,0 @@
-#!/bin/sh
-#
-#  This script sets up the /etc/netplan/interface file for the new
-# image.
-#
-# Steve
-# --
-# https://steve.fi/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/share/xen-tools/common.sh ]; then
-    . /usr/share/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-# From: https://serverfault.com/questions/54981/linux-command-line-tool-to-work-with-netmasks-cidr-notation
-mask2cdr ()
-{
-   # Assumes there's no "255." after a non-255 byte in the mask
-   local x=${1##*255.}
-   set -- 0^^^128^192^224^240^248^252^254^ $(( (${#1} - ${#x})*2 )) ${x%%.*}
-   x=${1%%$3*}
-   echo $(( $2 + (${#x}/4) ))
-}
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-#  Make sure we have an /etc/netplan directory.
-#
-mkdir -p ${prefix}/etc/netplan
-
-
-#
-#  A function to setup DHCP for our new image.
-#
-setupDynamicNetworking ()
-{
-    #
-    # The host is using DHCP.
-    #
-    cat <<E_O_DHCP > ${prefix}/etc/netplan/01-netcfg.yaml
-# Arno: Configure VM interface eth0 via DHCP
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    eth0:
-      dhcp4: true
-E_O_DHCP
-}
-
-
-
-#
-#  A function to setup static IP addresses for our new image.
-#
-setupStaticNetworking ()
-{
-    # Arno
-    cidr='24';
-    if [ -n "${netmask}" ]; then
-      cidr="$(mask2cdr ${netmask})"
-    fi
-    # p2p code by Volker Janzen
-    gate="      gateway4: ${gateway}";
-    point='';
-    if [ -n "${p2p}" ]; then
-       # For a p2p setup the gateway4 keyword is replaced by the
-       # following on-link default route, when it matches the
-       # gateway4.
-       if [ "${p2p}" = "${gateway}" ]; then
-          gate="      routes:
-      - to: 0.0.0.0/0
-        via: ${p2p}
-        on-link: true"
-       else
-          gate="${gate}
-      routes:
-      - to: ${p2p}
-        on-link: true"
-       fi
-    fi
-
-    #
-    # We have a static IP address
-    #
-    cat <<E_O_STATIC >${prefix}/etc/netplan/01-netcfg.yaml
-# Arno: Set static IP for VM interface eth0
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    eth0:
-      addresses: [${ip1}/${cidr}]
-${gate}
-      nameservers:
-          addresses: [${nameserver}]
-E_O_STATIC
-
-    # Arno: no support for multiple interfaces
-
-    #
-    # Hooks are run chrooted, hence the resolv.conf is moved
-    # temporarily to /etc/resolv.conf.old. Use that file, it
-    # will be restored after hooks are run.
-    #
-    if [ '' != "$nameserver" ]; then
-        rm -f ${prefix}/etc/resolv.conf.old
-        for ns in $nameserver; do
-            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
-        done
-    else
-        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
-    fi
-}
-
-
-
-
-#
-#  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

hooks/artful/50-setup-hostname

@@ -1 +0,0 @@
-../common/50-setup-hostname-deb

hooks/artful/60-copy-host-files

@@ -1 +0,0 @@
-../common/60-copy-host-files

hooks/artful/65-copy-user-files

@@ -1 +0,0 @@
-../common/65-copy-user-files

hooks/artful/70-install-ssh

@@ -1 +0,0 @@
-../common/70-install-ssh-deb

hooks/artful/75-fixup-securetty

@@ -1 +0,0 @@
-../common/75-fixup-securetty

hooks/artful/80-install-kernel-ubuntu

@@ -1 +0,0 @@
-../common/80-install-kernel-ubuntu

hooks/artful/80-install-modules

@@ -1 +0,0 @@
-../common/80-install-modules-deb

hooks/artful/81-install-modules-init-tools

@@ -1 +0,0 @@
-../common/81-install-modules-init-tools

hooks/artful/82-install-grub-legacy

@@ -1 +0,0 @@
-../common/82-install-grub-legacy

hooks/artful/90-make-fstab

@@ -1 +0,0 @@
-../common/90-make-fstab

hooks/artful/99-clean-image

@@ -1 +0,0 @@
-../common/99-clean-image-deb

hooks/artful/99-enable-daemons

@@ -1 +0,0 @@
-../common/99-enable-daemons

hooks/centos-5/25-setup-kernel

@@ -3,7 +3,7 @@
 #  This script sets up the kernel and fstab for CentOS 5.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -21,16 +21,16 @@ fi
 logMessage Script $0 starting
 
 # Make the console work
-sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab
+sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/etc/inittab
-sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab
+sed -i "s/^1:2345/#1:2345/" ${TARGET}/etc/inittab
 
 # MAKEDEV is needed at this point
-chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV
+chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV
-chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd
+chroot ${TARGET} /sbin/MAKEDEV sda sdb sdc sdd
 
 # Create fstab
 logMessage Create /etc/fstab
-cat > ${prefix}/etc/fstab << EOF
+cat > ${TARGET}/etc/fstab << EOF
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -39,29 +39,29 @@ none            /dev/pts        devpts  mode=0620       0       0
 EOF
 
 for i in `seq 1 $NUMPARTITIONS`; do
-  echo -n "/dev/xvde$i " >> ${prefix}/etc/fstab
+  echo -n "/dev/xvde$i " >> ${TARGET}/etc/fstab
   eval part=\$PARTITION$i
-  if [ -n "`echo $part | grep swap`" ]; then
+  if [ ! -z "`echo $part | grep swap`" ]; then
-     echo "none swap ws 0 0" >> ${prefix}/etc/fstab
+     echo "none swap ws 0 0" >> ${TARGET}/etc/fstab
   else
-     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
+     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${TARGET}/etc/fstab
   fi
 done
 
 # Install the kernel, grub and perl
-chroot ${prefix} yum clean expire-cache
+chroot ${TARGET} yum clean expire-cache
-chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64
+chroot ${TARGET} yum -y install kernel-xen grub.x86_64 perl.x86_64
 
-KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"`
+KERNELVERSION=`ls ${TARGET}/boot/vmlinuz-* | sed "s#${TARGET}/boot/vmlinuz-##"`
 logMessage "Kernel $KERNELVERSION found"
 
 # Create grub's menu.list
 logMessage "Creating /boot/grub/menu.lst"
-mkdir -p ${prefix}/boot/grub
+mkdir -p ${TARGET}/boot/grub
-cat > ${prefix}/boot/grub/menu.lst << EOF
+cat > ${TARGET}/boot/grub/menu.lst << EOF
-# WARNING : Don't forget to update this when you upgrade kernel!
+# WARNING : Don't forget to update this when you upgrade kernel !
 # You can also exclude kernel-xen from updates by putting
-# exclude=kernel-xen in [main] in yum.conf
+# exclude=kernel-xen in in [main] in yum.conf
 
 default=0
 timeout=5

hooks/centos-6/25-setup-kernel

@@ -3,7 +3,7 @@
 #  This script sets up the kernel and fstab for CentOS 5.
 #
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -21,16 +21,16 @@ fi
 logMessage Script $0 starting
 
 # Make the console work
-sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab
+sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/etc/inittab
-sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab
+sed -i "s/^1:2345/#1:2345/" ${TARGET}/etc/inittab
 
 # MAKEDEV is needed at this point
-chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV
+chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV
-chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd
+chroot ${TARGET} /sbin/MAKEDEV sda sdb sdc sdd
 
 # Create fstab
 logMessage Create /etc/fstab
-cat > ${prefix}/etc/fstab << EOF
+cat > ${TARGET}/etc/fstab << EOF
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -39,29 +39,29 @@ none            /dev/pts        devpts  mode=0620       0       0
 EOF
 
 for i in `seq 1 $NUMPARTITIONS`; do
-  echo -n "/dev/sda$i " >> ${prefix}/etc/fstab
+  echo -n "/dev/sda$i " >> ${TARGET}/etc/fstab
   eval part=\$PARTITION$i
-  if [ -n "`echo $part | grep swap`" ]; then
+  if [ ! -z "`echo $part | grep swap`" ]; then
-     echo "none swap ws 0 0" >> ${prefix}/etc/fstab
+     echo "none swap ws 0 0" >> ${TARGET}/etc/fstab
   else
-     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab
+     echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${TARGET}/etc/fstab
   fi
 done
 
 # Install the kernel, grub and perl
-chroot ${prefix} yum clean expire-cache
+chroot ${TARGET} yum clean expire-cache
-chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64
+chroot ${TARGET} yum -y install kernel-xen grub.x86_64 perl.x86_64
 
-KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"`
+KERNELVERSION=`ls ${TARGET}/boot/vmlinuz-* | sed "s#${TARGET}/boot/vmlinuz-##"`
 logMessage "Kernel $KERNELVERSION found"
 
 # Create grub's menu.list
 logMessage "Creating /boot/grub/menu.lst"
-mkdir -p ${prefix}/boot/grub
+mkdir -p ${TARGET}/boot/grub
-cat > ${prefix}/boot/grub/menu.lst << EOF
+cat > ${TARGET}/boot/grub/menu.lst << EOF
-# WARNING : Don't forget to update this when you upgrade kernel!
+# WARNING : Don't forget to update this when you upgrade kernel !
 # You can also exclude kernel-xen from updates by putting
-# exclude=kernel-xen in [main] in yum.conf
+# exclude=kernel-xen in in [main] in yum.conf
 
 default=0
 timeout=5
@@ -71,10 +71,10 @@ initrd        /boot/initramfs-$KERNELVERSION.img
 EOF
 
 # Some use lvm but mkinitrd will generate a wrong initrd when these are present.
-rm -f ${prefix}/etc/lvm/backup/* ${prefix}/etc/lvm/archive/*
+rm -f ${TARGET}/etc/lvm/backup/* ${TARGET}/etc/lvm/archive/*
 
 # Generate a correct initrd.
-chroot ${prefix} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\
+chroot ${TARGET} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\
  -f /boot/initramfs-$KERNELVERSION.img $KERNELVERSION
 
 #

hooks/common.sh

@@ -24,7 +24,7 @@ logMessage ()
 {
     message="$*"
 
-    if [ -n "${verbose}" ]; then
+    if [ ! -z "${verbose}" ]; then
         echo $message
     fi
 }
@@ -47,7 +47,7 @@ assert ()
         shift
     fi
 
-    if [ ! "$*" ] ; then
+    if [ ! $* ] ; then
         echo "assert failed: $0:$lineno [$*]"
         exit
     fi
@@ -55,63 +55,7 @@ assert ()
 
 
 #
-#  Install a number of Debian packages via apt-get including Recommends.
+#  Install a number of Debian packages via apt-get.
-#
-#  We take special care so that daemons shouldn't start after installation
-# which they might otherwise do.
-#
-installDebianPackageAndRecommends ()
-{
-    prefix=$1
-    shift
-
-    #
-    # Log our options
-    #
-    logMessage "Installing Debian packages $@ to prefix ${prefix}"
-
-    #
-    #  We require a package + prefix
-    #
-    assert "$LINENO" "${prefix}"
-
-    #
-    # Prefix must be a directory.
-    #
-    assert "$LINENO" -d ${prefix}
-
-    #
-    #  Use policy-rc to stop any daemons from starting.
-    #
-    printf '#!/bin/sh\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d
-    chmod +x ${prefix}/usr/sbin/policy-rc.d
-
-    #
-    # Disable the start-stop-daemon - this shouldn't be necessary
-    # with the policy-rc.d addition above, however leaving it in
-    # place won't hurt ..
-    #
-    disableStartStopDaemon ${prefix}
-
-    #
-    # Install the packages
-    #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes install "$@" 2>&1 | sed --expression="s/\rExtracting templates from packages: [0-9]\+%//g;s/(Reading database ... \([0-9]\+%\)\?\r//g"
-
-    #
-    #  Remove the policy-rc.d script.
-    #
-    rm -f ${prefix}/usr/sbin/policy-rc.d
-
-    #
-    # Re-enable the start-stop-daemon
-    #
-    enableStartStopDaemon ${prefix}
-
-}
-
-#
-#  Install a number of Debian packages via apt-get, but without Recommends
 #
 #  We take special care so that daemons shouldn't start after installation
 # which they might otherwise do.
@@ -120,18 +64,61 @@ installDebianPackageAndRecommends ()
 #
 installDebianPackage ()
 {
-    prefix=$1
+    TARGET=$1
     shift
 
-    installDebianPackageAndRecommends ${prefix} -o APT::Install-Recommends=false "$@"
+    #
+    # Log our options
+    #
+    logMessage "Installing Debian packages $@ to target ${TARGET}"
+
+    #
+    #  We require a package + target
+    #
+    assert "$LINENO" "${TARGET}"
+
+    #
+    # Target must be a directory.
+    #
+    assert "$LINENO" -d ${TARGET}
+
+    #
+    #  Use policy-rc to stop any daemons from starting.
+    #
+    printf '#!/bin/sh\nexit 101\n' > ${TARGET}/usr/sbin/policy-rc.d
+    chmod +x ${TARGET}/usr/sbin/policy-rc.d
+
+    #
+    # Disable the start-stop-daemon - this shouldn't be necessary
+    # with the policy-rc.d addition above, however leaving it in
+    # place won't hurt ..
+    #
+    disableStartStopDaemon ${TARGET}
+
+    #
+    # Install the packages
+    #
+    DEBIAN_FRONTEND=noninteractive chroot ${TARGET} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@"
+
+    #
+    #  Remove the policy-rc.d script.
+    #
+    rm -f ${TARGET}/usr/sbin/policy-rc.d
+
+    #
+    # Re-enable the start-stop-daemon
+    #
+    enableStartStopDaemon ${TARGET}
+
 }
 
+
 #
 #  Generate a Debian-/Ubuntu-compliant menu.lst for legacy GRUB
 #
 generateDebianGrubMenuLst ()
 {
-    prefix="$1"
+    TARGET="$1"
     DOMU_ISSUE="$2"
     DOMU_KERNEL="$3"
     DOMU_RAMDISK="$4"
@@ -139,27 +126,27 @@ generateDebianGrubMenuLst ()
     #
     # Log our options
     #
-    logMessage "Generating a legacy GRUB menu.lst into prefix ${prefix}"
+    logMessage "Generating a legacy GRUB menu.lst into target ${TARGET}"
 
     #
     #  We require at least 3 parameters
     #
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
     assert "$LINENO" "${DOMU_ISSUE}"
     assert "$LINENO" "${DOMU_KERNEL}"
 
     #
-    # Prefix must be a directory, kernel a file
+    # Target must be a directory, kernel a file
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
-    assert "$LINENO" -f "${prefix}/boot/${DOMU_KERNEL}"
+    assert "$LINENO" -f "${TARGET}/boot/${DOMU_KERNEL}"
 
     #
     # Generate a menu.lst for pygrub
     #
 
-    mkdir -p ${prefix}/boot/grub
+    mkdir -p ${TARGET}/boot/grub
-    cat << E_O_MENU > ${prefix}/boot/grub/menu.lst
+    cat << E_O_MENU > ${TARGET}/boot/grub/menu.lst
 default         0
 timeout         2
 
@@ -210,7 +197,7 @@ timeout         2
 # altoptions=(single-user mode) single
 
 ## controls how many kernels should be put into the menu.lst
-## only counts the first occurrence of a kernel, not the
+## only counts the first occurence of a kernel, not the
 ## alternative kernel options
 ## e.g. howmany=all
 ##      howmany=7
@@ -269,19 +256,17 @@ E_O_MENU
 #
 disableStartStopDaemon ()
 {
-   local prefix="$1"
+   local TARGET="$1"
-   assert "$LINENO" "${prefix}"
+   assert "$LINENO" "${TARGET}"
    for starter in start-stop-daemon initctl; do
-      local daemonfile="${prefix}/sbin/${starter}"
+      local daemonfile="${TARGET}/sbin/${starter}"
 
-      if [ -e "${daemonfile}" ]; then
+      mv "${daemonfile}" "${daemonfile}.REAL"
-         mv "${daemonfile}" "${daemonfile}.REAL"
+      echo '#!/bin/sh' > "${daemonfile}"
-         echo '#!/bin/sh' > "${daemonfile}"
+      echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
-         echo "echo \"Warning: Fake ${starter} called, doing nothing\"" >> "${daemonfile}"
 
-         chmod 755 "${daemonfile}"
+      chmod 755 "${daemonfile}"
-         logMessage "${starter} disabled / made a stub."
+      logMessage "${starter} disabled / made a stub."
-      fi
    done
 }
 
@@ -292,10 +277,10 @@ disableStartStopDaemon ()
 #
 enableStartStopDaemon ()
 {
-   local prefix=$1
+   local TARGET=$1
-   assert "$LINENO" "${prefix}"
+   assert "$LINENO" "${TARGET}"
    for starter in start-stop-daemon initctl; do
-      local daemonfile="${prefix}/sbin/${starter}"
+      local daemonfile="${TARGET}/sbin/${starter}"
 
       #
       #  If the disabled file is present then enable it.
@@ -316,28 +301,28 @@ enableStartStopDaemon ()
 #
 removeDebianPackage ()
 {
-    prefix=$1
+    TARGET=$1
     shift
 
     #
     # Log our options
     #
-    logMessage "Purging Debian package $@ from prefix ${prefix}"
+    logMessage "Purging Debian package ${package} from target ${TARGET}"
 
     #
-    #  We require a prefix
+    #  We require a target
     #
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
 
     #
-    # Prefix must be a directory.
+    # Target must be a directory.
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
 
     #
     # Purge the packages we've been given.
     #
-    chroot ${prefix} /usr/bin/apt-get remove --yes --purge "$@"
+    chroot ${TARGET} /usr/bin/apt-get remove --yes --purge "$@"
 
 }
 
@@ -347,29 +332,29 @@ removeDebianPackage ()
 #
 installRPMPackage ()
 {
-    prefix=$1
+    TARGET=$1
     package=$2
 
     #
     # Log our options
     #
-    logMessage "Installing RPM ${package} to prefix ${prefix}"
+    logMessage "Installing RPM ${package} to target ${TARGET}"
 
     #
-    #  We require a package + prefix
+    #  We require a package + target
     #
     assert "$LINENO" "${package}"
-    assert "$LINENO" "${prefix}"
+    assert "$LINENO" "${TARGET}"
 
     #
-    # Prefix must be a directory.
+    # Target must be a directory.
     #
-    assert "$LINENO" -d ${prefix}
+    assert "$LINENO" -d ${TARGET}
 
     #
     # Install the package
     #
-    chroot ${prefix} /usr/bin/yum -y install ${package}
+    chroot ${TARGET} /usr/bin/yum -y install ${package}
 }
 
 # Backwards Compatibility Function
@@ -388,7 +373,7 @@ isYum() ( [ -x $1/usr/bin/yum ] )
 #
 installPackage ()
 {
-        prefix=$1
+        TARGET=$1
         package=$2
 
         if isDeb ; then
@@ -411,13 +396,13 @@ installPackage ()
 #
 installGentooPackage ()
 {
-    prefix=$1
+    TARGET=$1
     package=$2
 
     #
     # Log our options
     #
-    logMessage "Installing Gentoo package ${package} to prefix ${prefix}"
+    logMessage "Installing Gentoo package ${package} to target ${TARGET}"
 
     logMessage "NOTE: Not doing anything - this is a stub - FIXME"
 

hooks/common/01-disable-daemons

@@ -5,10 +5,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -30,20 +30,20 @@ logMessage Script $0 starting
 #
 #  Make sure we have a directory.
 #
-if [ ! -d "${prefix}/usr/sbin" ]; then
+if [ ! -d "${TARGET}/usr/sbin" ]; then
 
-    mkdir -p "${prefix}/usr/sbin"
+    mkdir -p "${TARGET}/usr/sbin"
 
-    logMessage "created missing directory: ${prefix}/usr/sbin"
+    logMessage "created missing directory: ${TARGET}/usr/sbin"
 fi
 
 
 #
 #  Add the script.
 #
-echo '#!/bin/sh' >  ${prefix}/usr/sbin/policy-rc.d
+echo '#!/bin/sh' >  ${TARGET}/usr/sbin/policy-rc.d
-echo 'exit 101'  >> ${prefix}/usr/sbin/policy-rc.d
+echo 'exit 101'  >> ${TARGET}/usr/sbin/policy-rc.d
-chmod 755           ${prefix}/usr/sbin/policy-rc.d
+chmod 755           ${TARGET}/usr/sbin/policy-rc.d
 
 
 

hooks/common/05-shadowconfig-on

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,9 +29,9 @@ logMessage Script $0 starting
 #
 # Enable the shadow passwords if the command is found.
 #
-if [ -x ${prefix}/sbin/shadowconfig ]; then
+if [ -x ${TARGET}/sbin/shadowconfig ]; then
 
-   chroot ${prefix} /sbin/shadowconfig on
+   chroot ${TARGET} /sbin/shadowconfig on
 else
 
    logMessage "/sbin/shadowconfig not found.  skipping."

hooks/common/10-disable-tls

@@ -4,11 +4,11 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -37,8 +37,8 @@ if [ "`uname -m`" = "x86_64" ]; then
 else
 
     logMessage "Disabling TLS"
-    mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+    mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled
-    mkdir ${prefix}/lib/tls
+    mkdir ${TARGET}/lib/tls
 fi
 
 

hooks/common/15-disable-hwclock

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Disable the startup scripts from all runlevels.
 #
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
+chroot ${TARGET} /usr/sbin/update-rc.d -f hwclock.sh remove
 
 #
 # Log our finish

hooks/common/20-setup-apt

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -33,17 +33,17 @@ logMessage Script $0 starting
 # the setting to the proxy guess file.
 #
 if [ ${apt_proxy} ]; then
-  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${TARGET}/etc/apt/apt.conf.d/01proxy
 else
   logMessage The use of a proxy detected.
-  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${TARGET}/etc/apt/apt.conf.d/01proxy
 fi
 
 
 #
 # Setup the sources.list file for new installations of Ubuntu GNU/Linux.
 #
-cat <<E_O_APT > ${prefix}/etc/apt/sources.list
+cat <<E_O_APT > ${TARGET}/etc/apt/sources.list
 #
 #  /etc/apt/sources.list
 #
@@ -66,7 +66,7 @@ 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
+chroot ${TARGET} /usr/bin/apt-get update
 
 
 #
@@ -76,7 +76,7 @@ chroot ${prefix} /usr/bin/apt-get update
 if [ "$arch" = 'i386' -a "$dist" != 'dapper' ]; then
 
     logMessage "Installing libc6-xen"
-    installDebianPackage ${prefix} libc6-xen
+    installDebianPackage ${TARGET} libc6-xen
 
 fi
 

hooks/common/20-setup-yum

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,12 +29,12 @@ logMessage Script $0 starting
 #
 # Update yum
 #
-if [ ! -d ${prefix}/proc ]; then
+if [ ! -d ${TARGET}/proc ]; then
-    mkdir -p ${prefix}/proc
+    mkdir -p ${TARGET}/proc
 fi
-mount -o bind /proc ${prefix}/proc
+mount -o bind /proc ${TARGET}/proc
-chroot ${prefix} /usr/bin/yum update -y
+chroot ${TARGET} /usr/bin/yum update
-umount ${prefix}/proc
+umount ${TARGET}/proc
 
 
 #

hooks/common/25-generate-locale

@@ -7,7 +7,7 @@
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -31,7 +31,7 @@ logMessage Script $0 starting
 #
 #  NOTE:  Failure to support your favourite language is *not* a bug.
 #
-installDebianPackage ${prefix} language-pack-en
+installDebianPackage ${TARGET} language-pack-en
 
 
 #

hooks/common/30-disable-gettys

@@ -6,7 +6,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -30,26 +30,26 @@ logMessage Script $0 starting
 #
 
 # Upstart on Ubuntu newer than 8.04
-rm -f ${prefix}/etc/init/tty[!1].conf
+rm -f ${TARGET}/etc/init/tty[!1].conf
-[ -f ${prefix}/etc/init/tty1.conf ] && {
+[ -f ${TARGET}/etc/init/tty1.conf ] && {
-    sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
+    sed -i -e s/tty1/hvc0/ ${TARGET}/etc/init/tty1.conf
-    mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
+    mv ${TARGET}/etc/init/tty1.conf  ${TARGET}/etc/init/hvc0.conf
 }
 # Upstart on Ubuntu 8.04 or older
-rm -f ${prefix}/etc/event.d/tty[!1]
+rm -f ${TARGET}/etc/event.d/tty[!1]
-[ -f ${prefix}/etc/event.d/tty1 ] && {
+[ -f ${TARGET}/etc/event.d/tty1 ] && {
-    sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
+    sed -i -e s/tty1/hvc0/ ${TARGET}/etc/event.d/tty1
-    mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
+    mv ${TARGET}/etc/event.d/tty1 ${TARGET}/etc/event.d/hvc0
 }
 
 # Inittab
-[ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
+[ -f ${TARGET}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${TARGET}/etc/inittab
 
 
 #
 #  Are we using an alternative serial device?
 #
-if [ -n "${serial_device}" ]; then
+if [ ! -z "${serial_device}" ]; then
 
     serial_device=`basename ${serial_device}`
 
@@ -59,21 +59,21 @@ if [ -n "${serial_device}" ]; then
     # replace existing device.
 
     # Upstart on Ubuntu newer than 8.04
-    [ -f ${prefix}/etc/init/hvc0.conf ] && {
+    [ -f ${TARGET}/etc/init/hvc0.conf ] && {
-        mv ${prefix}/etc/init/hvc0.conf  ${prefix}/etc/init/${serial_device}.conf
+        mv ${TARGET}/etc/init/hvc0.conf  ${TARGET}/etc/init/${serial_device}.conf
-        sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf
+        sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/init/${serial_device}.conf
     }
     # Upstart on Ubuntu 8.04 or older
-    [ -f ${prefix}/etc/event.d/hvc0 ] && {
+    [ -f ${TARGET}/etc/event.d/hvc0 ] && {
-        mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
+        mv ${TARGET}/etc/event.d/hvc0  ${TARGET}/etc/event.d/${serial_device}
-        sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
+        sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/event.d/${serial_device}
     }
 
     # Inittab
-    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
+    [ -f ${TARGET}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/inittab
 
     # make sure that it is allowed to login.
-    echo $serial_device >> ${prefix}/etc/securetty
+    echo $serial_device >> ${TARGET}/etc/securetty
 fi
 
 

hooks/common/35-setup-users

@@ -9,7 +9,7 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
 use strict;

hooks/common/40-setup-networking-deb

@@ -5,10 +5,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Make sure we have an /etc/network directory.
 #
-mkdir -p ${prefix}/etc/network
+mkdir -p ${TARGET}/etc/network
 
 
 #
@@ -40,7 +40,7 @@ setupDynamicNetworking ()
     #
     # The host is using DHCP.
     #
-    cat <<E_O_DHCP > ${prefix}/etc/network/interfaces
+    cat <<E_O_DHCP > ${TARGET}/etc/network/interfaces
 # This file describes the network interfaces available on your system
 # and how to activate them. For more information, see interfaces(5).
 
@@ -71,8 +71,8 @@ setupStaticNetworking ()
     #  if $p2p is set then add a "pointopoint" setting.
     #
     point='';
-    if [ -n "${p2p}" ]; then
+    if [ ! -z "${p2p}" ]; then
-        point=" pointopoint ${p2p}"
+        point="pointopoint ${p2p}"
     else
         point=''
     fi
@@ -81,22 +81,14 @@ setupStaticNetworking ()
     # broadcast address?
     #
     bcast='';
-    if [ -n "${broadcast}" ]; then
+    if [ ! -z "${broadcast}" ]; then
       bcast=" broadcast ${broadcast}"
     fi
 
-    #
-    # gateway address?
-    #
-    gway='';
-    if [ -n "${gateway}" ]; then
-      gway=" gateway ${gateway}"
-    fi
-
     #
     # We have a static IP address
     #
-    cat <<E_O_STATIC >${prefix}/etc/network/interfaces
+    cat <<E_O_STATIC >${TARGET}/etc/network/interfaces
 # This file describes the network interfaces available on your system
 # and how to activate them. For more information, see interfaces(5).
 
@@ -108,10 +100,10 @@ iface lo inet loopback
 auto eth0
 iface eth0 inet static
  address ${ip1}
-${gway}
+ gateway ${gateway}
  netmask ${netmask}
-${bcast}
+ ${bcast}
-${point}
+ ${point}
  # post-up  ethtool -K eth0 tx off
 
 #
@@ -130,7 +122,7 @@ E_O_STATIC
 
         logMessage Adding etho:${interface}
 
-        cat <<E_O_STATIC >>${prefix}/etc/network/interfaces
+        cat <<E_O_STATIC >>${TARGET}/etc/network/interfaces
 auto eth0:${interface}
 iface eth0:${interface} inet static
  address ${value}
@@ -147,12 +139,12 @@ E_O_STATIC
     # will be restored after hooks are run.
     #
     if [ '' != "$nameserver" ]; then
-        rm -f ${prefix}/etc/resolv.conf.old
+        rm -f ${TARGET}/etc/resolv.conf.old
         for ns in $nameserver; do
-            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+            echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
         done
     else
-        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
+        cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
     fi
 }
 

hooks/common/40-setup-networking-rpm

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Make sure we have an /etc/sysconfig/network-scripts directory.
 #
-mkdir -p ${prefix}/etc/sysconfig/network-scripts/
+mkdir -p ${TARGET}/etc/sysconfig/network-scripts/
 
 
 #
@@ -40,7 +40,7 @@ if [ -z "${dhcp}" ]; then
     #
     #  Setup the initial interface
     #
-    cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
+    cat <<E_O_STATIC >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0
 DEVICE=eth0
 ONBOOT=yes
 BOOTPROTO=static
@@ -62,7 +62,7 @@ E_O_STATIC
 
          logMessage Adding etho:${interface}
 
-         cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface}
+         cat <<E_O_STATIC >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface}
 DEVICE=eth0:${interface}
 ONBOOT=yes
 BOOTPROTO=static
@@ -79,27 +79,27 @@ E_O_STATIC
     # will be restored after hooks are run.
     #
     if [ '' != "$nameserver" ]; then
-        rm -f ${prefix}/etc/resolv.conf.old
+        rm -f ${TARGET}/etc/resolv.conf.old
         for ns in $nameserver; do
-            echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
+            echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
         done
     else
-        cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old
+        cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
     fi
 else
-    cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0
+    cat <<E_O_DHCP >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0
 DEVICE=eth0
 BOOTPROTO=dhcp
 ONBOOT=yes
 E_O_DHCP
-    chroot ${prefix} /usr/bin/yum -y install dhclient
+    chroot ${TARGET} /usr/bin/yum -y install dhclient
 fi
 
 
 #
 #  Don't forget to setup the default route.
 #
-cat <<EOF >${prefix}/etc/sysconfig/network
+cat <<EOF >${TARGET}/etc/sysconfig/network
 NETWORKING=yes
 GATEWAY=${gateway}
 HOSTNAME=${hostname}

hooks/common/50-setup-hostname-deb

@@ -5,11 +5,11 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -43,8 +43,8 @@ umask 022
 #
 #  Setup the mailname + hostname files.
 #
-echo $GUEST_HOSTNAME > ${prefix}/etc/hostname
+echo $GUEST_HOSTNAME > ${TARGET}/etc/hostname
-echo $GUEST_FQDN > ${prefix}/etc/mailname
+echo $GUEST_FQDN > ${TARGET}/etc/mailname
 
 
 #
@@ -55,7 +55,7 @@ if [ -z "${copyhosts}" ]; then
     #
     #  Copy localhost
     #
-    cat > ${prefix}/etc/hosts <<EOF
+    cat > ${TARGET}/etc/hosts <<EOF
 127.0.0.1    localhost
 EOF
     #
@@ -63,23 +63,23 @@ EOF
     #
     if [ -z "${dhcp}" ]; then
         #
-        #  If DHCP is disabled, FQDN should resolve to our IP
+        #  If dhcp is diabled, FQDN should resolve to our IP
         #
-        cat >> ${prefix}/etc/hosts <<EOF
+        cat >> ${TARGET}/etc/hosts <<EOF
 ${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     else
-        cat >> ${prefix}/etc/hosts <<EOF
+        cat >> ${TARGET}/etc/hosts <<EOF
 127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 EOF
     fi
 
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 
 # The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback
 fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
+ff00::0 ip6-mcastTARGET
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
@@ -88,23 +88,23 @@ EOF
 
 else
     # Non-IPv6 stuff.
-    grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
+    grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
 
     # New entry.
     if [ -z "${dhcp}" ]; then
-        cat >> ${prefix}/etc/hosts <<EOF
+        cat >> ${TARGET}/etc/hosts <<EOF
 ${ip1}    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     else
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 127.0.1.1    $GUEST_FQDN $GUEST_HOSTNAME
 
 EOF
     fi
 
     # IPv6 stuff.
-    grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
+    grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
 fi
 
 

hooks/common/50-setup-hostname-rpm

@@ -5,11 +5,11 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -37,8 +37,8 @@ umask 022
 #
 #  Setup the mailname + hostname files.
 #
-echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname
+echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${TARGET}/etc/hostname
-echo ${hostname} > ${prefix}/etc/mailname
+echo ${hostname} > ${TARGET}/etc/mailname
 
 
 #
@@ -48,21 +48,21 @@ echo ${hostname} > ${prefix}/etc/mailname
 if [ -z "${dhcp}" ]; then
 
     # Non-IPv6 stuff.
-    grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts
+    grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
 
     # New entry.
-    echo "${ip1}    ${hostname}" >> ${prefix}/etc/hosts
+    echo "${ip1}    ${hostname}" >> ${TARGET}/etc/hosts
-    echo " " >> ${prefix}/etc/hosts
+    echo " " >> ${TARGET}/etc/hosts
 
     # IPv6 stuff.
-    grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts
+    grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
 
 else
 
     #
     #  Stub /etc/hosts for DHCP clients.
     #
-    cat >> ${prefix}/etc/hosts <<EOF
+    cat >> ${TARGET}/etc/hosts <<EOF
 127.0.0.1       localhost
 
 # The following lines are desirable for IPv6 capable hosts

hooks/common/55-create-dev

@@ -5,10 +5,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -32,8 +32,8 @@ logMessage Script $0 starting
 MAKEDEV=''
 MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV"
 for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do
-    if [ -x "${prefix}${MAKEDEV_PATH}" ]; then
+    if [ -x "${TARGET}${MAKEDEV_PATH}" ]; then
-    MAKEDEV="${prefix}${MAKEDEV_PATH}"
+    MAKEDEV="${TARGET}${MAKEDEV_PATH}"
     break
     fi
 done
@@ -44,11 +44,11 @@ if [ -n "${MAKEDEV}" ]; then
 # Early termination if we have a couple of common devices present
 # should speed up installs which use --copy/--tar
 #
-if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then
+if ( test `ls -1 ${TARGET}/dev | wc -l` -gt 10 ); then
     #
     # We still need to make sure the basic devices are present
     #
-    cd ${prefix}/dev
+    cd ${TARGET}/dev
     ${MAKEDEV} std
     ${MAKEDEV} hda
     ${MAKEDEV} sda
@@ -62,7 +62,7 @@ fi
 #
 #  Make the device nodes.
 #
-cd ${prefix}/dev
+cd ${TARGET}/dev
 ${MAKEDEV} generic
 ${MAKEDEV} std
 

hooks/common/60-copy-host-files

@@ -1,10 +1,11 @@
 #!/bin/sh
 #
-#  Copy some specific files from host nachine into the new images
+#  Copy files from a 'skel' directory, if present, into the
+# new images
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -26,8 +27,8 @@ logMessage Script $0 starting
 #
 # Copy "required" files from our host.
 #
-cp /etc/timezone    ${prefix}/etc
+cp /etc/timezone    ${TARGET}/etc
-cp /etc/localtime   ${prefix}/etc
+cp /etc/localtime   ${TARGET}/etc
 
 
 #

hooks/common/65-copy-user-files

@@ -5,7 +5,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -32,13 +32,13 @@ 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 -)
+    (cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${TARGET}/; tar -xpf -)
 
     logMessage Finished
 
 else
 
-    logMessage skel directory, /etc/xen-tools/skel, not present ignoring.
+    logMessage skel directory, /etc/xen-tools/skell, not present ignoring.
 
 fi
 

hooks/common/70-install-ssh-deb

@@ -8,9 +8,9 @@
 #
 # Dmitry Nedospasov
 # --
-# http://www.nedos.net/
+# http://nedos.net/
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -31,13 +31,13 @@ logMessage Script $0 starting
 #
 #  First, create an ssh directory
 #
-mkdir -p ${prefix}/etc/ssh
+mkdir -p ${TARGET}/etc/ssh
 
 #
 #  Second, Generate the Host RSA Key
 #
-if [ ! -f ${prefix}/etc/ssh/ssh_host_rsa_key ]; then
+if [ ! -f ${TARGET}/etc/ssh/ssh_host_rsa_key ]; then
-if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${TARGET}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generated RSA host key"
 else
     logMessage "failed to generate RSA host key"
@@ -47,8 +47,8 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if [ ! -f ${prefix}/etc/ssh/ssh_host_dsa_key ]; then
+if [ ! -f ${TARGET}/etc/ssh/ssh_host_dsa_key ]; then
-if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${TARGET}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generated DSA host key"
 else
     logMessage "failed to generate DSA host key"
@@ -58,7 +58,7 @@ fi
 #
 #  Install ssh
 #
-installDebianPackage ${prefix} openssh-server
+installDebianPackage ${TARGET} openssh-server
 
 #
 # Log our finish

hooks/common/70-install-ssh-rpm

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -28,12 +28,12 @@ logMessage Script $0 starting
 #
 # Install the OpenSSH server.
 #
-if [ ! -d ${prefix}/proc ]; then
+if [ ! -d ${TARGET}/proc ]; then
-    mkdir -p ${prefix}/proc
+    mkdir -p ${TARGET}/proc
 fi
-mount -o bind /proc ${prefix}/proc
+mount -o bind /proc ${TARGET}/proc
-chroot ${prefix} /usr/bin/yum  -y install openssh-server passwd
+chroot ${TARGET} /usr/bin/yum  -y install openssh-server passwd
-umount ${prefix}/proc
+umount ${TARGET}/proc
 
 
 #

hooks/common/75-fixup-securetty

@@ -5,10 +5,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 # If the file doesn't exist exit early.
 #
-if [ ! -e ${prefix}/etc/securetty ]; then
+if [ ! -e ${TARGET}/etc/securetty ]; then
     logMessage /etc/securetty not found.
     exit
 fi
@@ -43,13 +43,13 @@ for i in xvc0 hvc0 ; do
     #
     #  Only append if not presnt.
     #
-    if ( grep $i ${prefix}/etc/securetty > /dev/null ) ; then
+    if ( grep $i ${TARGET}/etc/securetty > /dev/null ) ; then
 
         logMessage Host already has $i entry
 
     else
         
-        echo $i >> ${prefix}/etc/securetty
+        echo $i >> ${TARGET}/etc/securetty
     fi
 
 done

hooks/common/80-install-modules-deb

@@ -9,10 +9,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -31,7 +31,7 @@ fi
 #
 logMessage Script $0 starting
 
-if [ "${pygrub}" = "1" ]; then
+if [ ${pygrub} ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
@@ -50,16 +50,16 @@ if [ -n "${modules}" -a -d "${modules}" ]; then
     #
     logMessage "Copying modules from ${modules}"
 
-    mkdir -p ${prefix}/lib/modules
+    mkdir -p ${TARGET}/lib/modules
-    cp -au ${modules} ${prefix}/lib/modules
+    cp -au ${modules} ${TARGET}/lib/modules
-elif chroot ${prefix} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then
+elif chroot ${TARGET} /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}
+    installDebianPackage ${TARGET} ${linux_modules_package}
 else
 
     #
@@ -69,8 +69,8 @@ else
     logMessage "Package '${linux_modules_package}' is not available"
     logMessage "Copying modules from /lib/modules/$(uname -r)"
 
-    mkdir -p ${prefix}/lib/modules
+    mkdir -p ${TARGET}/lib/modules
-    cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules
+    cp -au /lib/modules/$(uname -r) ${TARGET}/lib/modules
 fi
 
 fi # if pygrub

hooks/common/80-install-modules-rpm

@@ -9,10 +9,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -36,8 +36,8 @@ logMessage Script $0 starting
 #  Copy the modules from the host to the new system - we should only
 # really copy the *correct* modules, but we don't know what they are.
 #
-mkdir -p ${prefix}/lib/modules
+mkdir -p ${TARGET}/lib/modules
-cp -au /lib/modules/*/ ${prefix}/lib/modules
+cp -au /lib/modules/*/ ${TARGET}/lib/modules
 
 
 #

hooks/common/81-install-modules-init-tools

@@ -6,7 +6,7 @@
 # can't really do anything bad; just waste a bit of space.
 #
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -28,14 +28,14 @@ logMessage Script $0 starting
 #
 #  Install either kmod or module-init-tools package.
 #
-if chroot ${prefix} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
+if chroot ${TARGET} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
-    if chroot ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
+    if chroot ${TARGET} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
-        installDebianPackage ${prefix} kmod
+        installDebianPackage ${TARGET} kmod
     else
-        installDebianPackage ${prefix} module-init-tools
+        installDebianPackage ${TARGET} module-init-tools
     fi
 else
-    installDebianPackage ${prefix} kmod
+    installDebianPackage ${TARGET} kmod
 fi
 
 #

hooks/common/82-install-grub-legacy

@@ -7,7 +7,7 @@
 # really do anything bad; just waste a bit of space.
 
 
-prefix=$1
+TARGET=$1
 
 
 
@@ -26,25 +26,21 @@ fi
 #
 logMessage Script $0 starting
 
-if [ "${pygrub}" = "1" ]; then
+if [ ${pygrub} ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
 #
-if chroot ${prefix} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
+if chroot ${TARGET} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
-    installDebianPackage ${prefix} grub-legacy
+    installDebianPackage ${TARGET} grub-legacy
 else
-    installDebianPackage ${prefix} grub
+    installDebianPackage ${TARGET} grub
 fi
 
-if [ ! -e ${prefix}/boot/grub/default ]; then
+if [ ! -e ${TARGET}/boot/grub/default ]; then
-    echo default > ${prefix}/boot/grub/default
+    echo default > ${TARGET}/boot/grub/default
 fi
-mount -o bind /proc ${prefix}/proc
+chroot ${TARGET} /usr/sbin/update-grub
-mount -o bind /dev ${prefix}/dev
-chroot ${prefix} /usr/sbin/update-grub
-umount ${prefix}/proc
-umount ${prefix}/dev
 
 else
     logMessage "pygrub not set, skipping grub-legacy installation"

hooks/common/90-make-fstab

@@ -9,10 +9,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -48,7 +48,7 @@ if [ "${ide}" ]; then
 elif [ "${scsi}" ]; then
     device=sda
 else
-    if [ -n "${disk_device}" ]; then
+    if [ ! -z "${disk_device}" ]; then
         device=`basename $disk_device`
     fi
 fi
@@ -62,7 +62,7 @@ logMessage "Root device is /dev/$device"
 has_xfs=0
 has_reiserfs=0
 has_btrfs=0
-cat <<E_O_FSTAB > ${prefix}/etc/fstab
+cat <<E_O_FSTAB > ${TARGET}/etc/fstab
 # /etc/fstab: static file system information.
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
@@ -93,9 +93,9 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
     esac
 
     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" >> ${TARGET}/etc/fstab
     else
-        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab
+        echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${TARGET}/etc/fstab
     fi
 done
 
@@ -106,7 +106,7 @@ logMessage Checking for filesystem tools to install
 #  Install any required packages for the given root filesystem
 #
 if [ "$has_xfs" -eq 1 ]; then
-    installPackage ${prefix} xfsprogs
+    installPackage ${TARGET} xfsprogs
 fi
 if [ "$has_reiserfs" -eq 1 ]; then
     if isAPT; then

hooks/common/99-clean-image-deb

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
 #
 #  Clean the APT package cache for Debian GNU/Linux.
 #
-chroot ${prefix} /usr/bin/apt-get clean
+chroot ${TARGET} /usr/bin/apt-get clean
 
 
 #

hooks/common/99-clean-image-rpm

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -29,20 +29,20 @@ logMessage Script $0 starting
 # Clean up RPM files.
 #
 logMessage Cleaning .rpm* files.
-find ${prefix}/ -name '*.rpmorig' -exec rm -f \{\} \;
+find ${TARGET}/ -name '*.rpmorig' -exec rm -f \{\} \;
-find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
+find ${TARGET}/ -name '*.rpmnew' -exec rm -f \{\} \;
 
 #
 #  Clean yum
 #
 logMessage Cleaning Yum Repository
 
-if [ ! -d ${prefix}/proc ]; then
+if [ ! -d ${TARGET}/proc ]; then
-    mkdir -p ${prefix}/proc
+    mkdir -p ${TARGET}/proc
 fi
-mount -o bind /proc ${prefix}/proc
+mount -o bind /proc ${TARGET}/proc
-chroot ${prefix} /usr/bin/yum clean all
+chroot ${TARGET} /usr/bin/yum clean all
-umount ${prefix}/proc
+umount ${TARGET}/proc
 
 #
 #  Log our finish

hooks/common/99-enable-daemons

@@ -4,11 +4,11 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -30,11 +30,11 @@ logMessage Script $0 starting
 #
 #  Remove the script if present.
 #
-if [ -x "${prefix}/usr/sbin/policy-rc.d" ]; then
+if [ -x "${TARGET}/usr/sbin/policy-rc.d" ]; then
 
-    rm -f "${prefix}/usr/sbin/policy-rc.d"
+    rm -f "${TARGET}/usr/sbin/policy-rc.d"
 
-    logMessage "Removed: ${prefix}/usr/sbin/policy-rc.d"
+    logMessage "Removed: ${TARGET}/usr/sbin/policy-rc.d"
 
 fi
 

hooks/debian/20-setup-apt

@@ -8,7 +8,7 @@
 #
 
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -33,17 +33,17 @@ logMessage Script $0 starting
 # the setting to the proxy guess file.
 #
 if [ ${apt_proxy} ]; then
-  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${TARGET}/etc/apt/apt.conf.d/01proxy
 else
   logMessage The use of a proxy detected.
-  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${TARGET}/etc/apt/apt.conf.d/01proxy
 fi
 
 
 #
 # Setup the sources.list file for new installations of Debian GNU/Linux.
 #
-cat <<E_O_APT > ${prefix}/etc/apt/sources.list
+cat <<E_O_APT > ${TARGET}/etc/apt/sources.list
 #
 #  /etc/apt/sources.list
 #
@@ -66,57 +66,29 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
      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
 
-    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+    cat <<E_O_APT >> ${TARGET}/etc/apt/sources.list
-
+# 
-        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+#  Security updates
-#
+# 
-# Security updates
-#
 deb     http://security.debian.org/ ${dist}/updates  main contrib non-free
 deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT
 
-    else
-
-        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
-#
-# Security updates
-#
-deb     http://security.debian.org/ ${dist}-security  main contrib non-free
-deb-src http://security.debian.org/ ${dist}-security  main contrib non-free
-E_O_APT
-
-    fi
-
 else
-
+    cat <<E_O_APT >> ${TARGET}/etc/apt/sources.list
-    if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then
+# 
-
+#  Security updates - Uncomment to enable.
-        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
+# 
-#
-# Security updates - Uncomment to enable.
-#
 # deb     http://security.debian.org/ ${dist}/updates  main contrib non-free
 # deb-src http://security.debian.org/ ${dist}/updates  main contrib non-free
 E_O_APT
 
-    else
-
-        cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
-#
-# Security updates - Uncomment to enable.
-#
-# deb     http://security.debian.org/ ${dist}-security  main contrib non-free
-# deb-src http://security.debian.org/ ${dist}-security  main contrib non-free
-E_O_APT
-
-    fi
 fi
     
 #
 #  Now that the sources have been setup make sure the system is up to date.
 #
-chroot ${prefix} /usr/bin/apt-get update
+chroot ${TARGET} /usr/bin/apt-get update
 
 #
 # For all systems after Sarge we install libc6-xen on i386
@@ -126,11 +98,11 @@ chroot ${prefix} /usr/bin/apt-get update
 if [ "${arch}" = "i386" ]; then
     if [ "${dist}" = 'sarge' ]; then
         logMessage "Disabling TLS"
-        mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+        mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled
-        mkdir ${prefix}/lib/tls
+        mkdir ${TARGET}/lib/tls
     else
         logMessage "Installing xen-aware libc6"
-        installDebianPackage ${prefix} libc6-xen
+        installDebianPackage ${TARGET} libc6-xen
     fi
 fi
 

hooks/debian/80-install-kernel

@@ -7,9 +7,9 @@
 #
 # Dmitry Nedospasov
 # --
-# http://www.nedos.net/
+# http://nedos.net
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -21,7 +21,7 @@ else
     . ./hooks/common.sh
 fi
 
-if [ "${pygrub}" = "1" ]; then
+if [ "${pygrub}" ]; then
 #
 # Log our start
 #
@@ -29,23 +29,19 @@ if [ "${pygrub}" = "1" ]; then
 logMessage Script $0 starting
 
 #
-# Resolve the correct architecture
+# Resolve the correct architecutre
 #
 
 if [ "${arch}" = "i386" ]; then
     XEN_ARCH="686"
 elif [ "${arch}" = "amd64" ]; then
     XEN_ARCH="amd64"
-elif [ "${arch}" = "arm64" ]; then
-    XEN_ARCH="arm64"
 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"
-    elif [ "${UNAME_ARCH}" = "aarch64" ]; then
-        XEN_ARCH="arm64"
     else
         logMessage Unknown kernel architecture ${UNAME_ARCH}.
         logMessage Please report this as bug to xen-tools-dev@xen-tools.org.
@@ -65,31 +61,20 @@ fi
 KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
 KERNEL_PKG="linux-image-$XEN_ARCH"
 
-# Add "-pae" suffix for Debian releases after Squeeze. See
-# https://bugs.debian.org/742778 for details.
-if [ "${dist}" != "sarge"   -a \
-     "${dist}" != "etch"    -a \
-     "${dist}" != "lenny"   -a \
-     "${dist}" != "squeeze" -a \
-     "$XEN_ARCH" = "686" ]; then
-    KERNEL_XEN_PKG="$KERNEL_XEN_PKG-pae"
-    KERNEL_PKG="$KERNEL_PKG-pae"
-fi
-
 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
+if chroot ${TARGET} /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 ${TARGET} initramfs-tools
-    installDebianPackage ${prefix} $KERNEL_XEN_PKG
+    installDebianPackage ${TARGET} $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
+    if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
         logMessage Package $KERNEL_PKG is available - installing
-        installDebianPackage ${prefix} initramfs-tools
+        installDebianPackage ${TARGET} initramfs-tools
-        installDebianPackage ${prefix} $KERNEL_PKG
+        installDebianPackage ${TARGET} $KERNEL_PKG
     else
         logMessage Package $KERNEL_PKG is not available
         logMessage pygrub set, but kernel could not be installed
@@ -98,30 +83,27 @@ else
     fi
 fi
 
-# Check for "ls -v" support
+DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
-V=''; if ls -1 ${prefix}/boot/vmlinuz* > /dev/null 2>&1; then V=-v; fi
-
-DOMU_KERNEL=$(basename $(ls -1 ${V} ${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)
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
 
 #
 # Generate initrd if it does not exist
 #
 
-if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
     logMessage initrd exists, skipping generation
 else
     logMessage initrd missing, generating
-    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
 fi
 
 #
 # Generate a menu.lst for pygrub
 #
 
-generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
+generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
 
 else

hooks/debian/95-configure-locales

@@ -4,9 +4,9 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
-prefix=$1
+TARGET=$1
 
 
 #
@@ -29,15 +29,15 @@ logMessage Script $0 starting
 # Default to the same locale as the host.
 #
 if [ -e /etc/locale.gen ]; then
-   cp /etc/locale.gen ${prefix}/etc
+   cp /etc/locale.gen ${TARGET}/etc
 fi
 
 #
 #  Install the package
 #
-installDebianPackage ${prefix} locales
+installDebianPackage ${TARGET} locales
-installDebianPackage ${prefix} util-linux-locales
+installDebianPackage ${TARGET} util-linux-locales
-chroot ${prefix} /usr/sbin/update-locale LANG=C
+chroot ${TARGET} /usr/sbin/update-locale LANG=C
 
 
 #

hooks/edgy/80-install-kernel

@@ -7,9 +7,9 @@
 #
 # Dmitry Nedospasov
 # --
-# http://www.nedos.net/
+# http://nedos.net
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ "${pygrub}" = "1" ]; then
+if [ "${pygrub}" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
@@ -37,19 +37,19 @@ 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
+if chroot ${TARGET} /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 ${TARGET} initramfs-tools
-    installDebianPackage ${prefix} $KERNEL_XEN_PKG
+    installDebianPackage ${TARGET} $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
+    if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
         logMessage Package $KERNEL_PKG is available - installing
-        installDebianPackage ${prefix} initramfs-tools
+        installDebianPackage ${TARGET} initramfs-tools
-        installDebianPackage ${prefix} $KERNEL_PKG
+        installDebianPackage ${TARGET} $KERNEL_PKG
     else
         logMessage Package $KERNEL_PKG is not available
         logMessage pygrub set, but kernel could not be installed
@@ -58,27 +58,27 @@ else
     fi
 fi
 
-DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1))
+DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/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)
+DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
 
 #
 # Generate initrd if it does not exist
 #
 
-if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then
+if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
     logMessage initrd exists, skipping generation
 else
     logMessage initrd missing, generating
-    chroot ${prefix} update-initramfs -c -k $KERNEL_REV
+    chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
 fi
 
 #
 # Generate a menu.lst for pygrub
 #
 
-generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
+generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
 
 
 else

hooks/gentoo/20-enable-su

@@ -4,10 +4,10 @@
 #
 # Steve
 # --
-# https://steve.fi/
+# http://www.steve.org.uk/
 
 
-prefix=$1
+TARGET=$1
 
 #
 #  Source our common functions
@@ -27,14 +27,14 @@ logMessage Script $0 starting
 #
 # Remove lines matching 'group' or 'wheel'.
 #
-grep -v wheel ${prefix}/etc/pam.d/su     > ${prefix}/etc/pam.d/su.tmp
+grep -v wheel ${TARGET}/etc/pam.d/su     > ${TARGET}/etc/pam.d/su.tmp
-grep -v group ${prefix}/etc/pam.d/su.tmp > ${prefix}/etc/pam.d/su
+grep -v group ${TARGET}/etc/pam.d/su.tmp > ${TARGET}/etc/pam.d/su
 
 #
 # Make sure permissions are correct.
 #
-chown root:root ${prefix}/etc/pam.d/su
+chown root:root ${TARGET}/etc/pam.d/su
-chmod 600       ${prefix}/etc/pam.d/su
+chmod 600       ${TARGET}/etc/pam.d/su
 
 #
 #  Log our finish