diff options
| author | Guilhem Moulin <guilhem@libreoffice.org> | 2016-10-19 13:07:11 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@libreoffice.org> | 2016-10-19 13:07:11 +0200 |
| commit | 3763273466bbc3e97701117c9cdbabe18d75c497 (patch) | |
| tree | f72355c9fd22c8da78ce262c34b4e9d9b78c13ee | |
| parent | a458bbcdeb06686bd34826fa8bcb1c4f4d2a4888 (diff) | |
wibble
| -rwxr-xr-x | tdfvm-install | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdfvm-install b/tdfvm-install index 859d913..37de6ce 100755 --- a/tdfvm-install +++ b/tdfvm-install @@ -36,7 +36,7 @@ HELP_MESSAGE="$(cat <<-EOF Usage $0 [OPTIONS] NAME --arch=ARCH target architecture (default: "$ARCH") --iso=FILENAME path to the installation ISO image to preseed (required) - -u,--username=USERNAME user account to create (default: root) + -u,--username=USERNAME user account to create (default: "$USER_NAME") -p,--password prompt for USERNAME's password (password login are disabled by default) --authorized-keys=FILENAME pass to USERNAME's authorized_keys(5) file -f,--force imediately the domain NAME if it exists, and remove existing configuration @@ -161,7 +161,7 @@ install -o libvirt-qemu -m 0700 --directory "$VMTMPDIR/virtfs" builddir="$(mktemp --tmpdir --directory)" trap 'rm -rf "$builddir"' EXIT TERM INT - cp -a ./tdf-postinst-udeb "$builddir" + rsync -aH "./tdf-postinst-udeb" "$builddir" find "$builddir" -mindepth 2 -maxdepth 2 -name debian -type d \ -execdir dpkg-buildpackage -us -uc -b -a "$ARCH" \; mkdir "$isoeditdir/pool-extra" |