From 360b2e60cf1de7e15b36e4ff53b5b77bd0142441 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 18 Jul 2012 11:49:05 +0200 Subject: [PATCH 1/2] qubeize_image: remove duplicated 3rd party soft installation --- qubeize_image | 3 --- 1 file changed, 3 deletions(-) diff --git a/qubeize_image b/qubeize_image index 4af5cb7..504f4b3 100755 --- a/qubeize_image +++ b/qubeize_image @@ -61,9 +61,6 @@ else ln -s "appmenus_generic" appmenus fi -echo "--> Installing 3rd party apps" -./add_3rd_party_software.sh - echo "--> Linking /home to /rw/home..." mv mnt/home mnt/home.orig ln -sf /rw/home mnt/home From a6ece886a4a108c69e5374d29baf83a2e810f5d3 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 18 Jul 2012 12:40:53 +0200 Subject: [PATCH 2/2] install qvm-tools docs in VM --- create_symlinks_in_rpms_to_install_dir.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/create_symlinks_in_rpms_to_install_dir.sh b/create_symlinks_in_rpms_to_install_dir.sh index bd05e8c..caa4d33 100755 --- a/create_symlinks_in_rpms_to_install_dir.sh +++ b/create_symlinks_in_rpms_to_install_dir.sh @@ -34,4 +34,8 @@ ln -s $SRC_ROOT/addons/rpm/x86_64/thunderbird-qubes-$VERSION_TB.rpm thunderbird- VERSION_GPG=$(cat $SRC_ROOT/addons/gpg-split/version)-1.$DIST.x86_64 ln -s $SRC_ROOT/addons/rpm/x86_64/qubes-gpg-split-$VERSION_GPG.rpm qubes-gpg-split.rpm +# FIXME: rel hardcoded +VERSION_DOCS=$(cat $SRC_ROOT/docs/version)-1.noarch +ln -s $SRC_ROOT/docs/rpm/noarch/qubes-doc-vm-$VERSION_DOCS.rpm qubes-doc-vm.rpm + popd