QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pinned sysvinit again; lets see if it will prevent it from being re-installed

Browse Source 
Added more configurations to attempt to build Whonix un-attended
This commit is contained in:
Jason Mehring 2014-10-17 00:24:00 -04:00
parent 12d3808282
commit c19c9a579a
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts_debian/02_install_groups.sh
View File

@ -142,6 +142,15 @@ EOF
debug "Preventing sysvinit re-installation" debug "Preventing sysvinit re-installation"
chroot "$INSTALLDIR" apt-mark hold sysvinit chroot "$INSTALLDIR" apt-mark hold sysvinit
# Pin sysvinit to prevent being re-installed
read -r -d '' SYSVINIT_APT_PIN <<'EOF'
Package: sysvinit
Pin: version *
Pin-Priority: -100
EOF
echo "$SYSVINIT_APT_PIN" > "$INSTALLDIR/etc/apt/preferences.d/qubes_sysvinit"
chmod 0644 "$INSTALLDIR/etc/apt/preferences.d/qubes_sysvinit"
chroot "$INSTALLDIR" apt-get update chroot "$INSTALLDIR" apt-get update
DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
chroot "$INSTALLDIR" apt-get -y --force-yes install systemd-sysv chroot "$INSTALLDIR" apt-get -y --force-yes install systemd-sysv

37
scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh
View File

@ -182,35 +182,44 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Patch anon-meta-packages to not depend on grub-pc # Patch anon-meta-packages to not depend on grub-pc
# XXX: Seems like the error disappears, but then whonix updates to original code?
pushd "$WHONIX_DIR" pushd "$WHONIX_DIR"
{ {
#su user -c "git branch qubes 9.2" || :;
#su user -c "git checkout qubes" || :;
sed -i 's/grub-pc//g' grml_packages || :; sed -i 's/grub-pc//g' grml_packages || :;
su user -c "git commit -am 'removed grub-pc depend'" || :; #su user -c "git commit -am 'removed grub-pc depend'" || :;
} }
popd popd
pushd "$WHONIX_DIR/packages/anon-meta-packages/debian" pushd "$WHONIX_DIR/packages/anon-meta-packages/debian"
{ {
#su user -c "git branch qubes" || :;
#su user -c "git checkout qubes" || :;
sed -i 's/ grub-pc,//g' control || :; sed -i 's/ grub-pc,//g' control || :;
su user -c "dpkg-source --commit" || :; cd ..;
su user -c "git commit -am 'removed grub-pc depend'" || :; su user -c "dpkg-source -q --commit . no_grub" || :;
#git add .
#su user -c "git commit -am 'removed grub-pc depend'" || :;
} }
popd popd
pushd "$WHONIX_DIR/packages/anon-shared-build-fix-grub/usr/lib/anon-dist/chroot-scripts-post.d" pushd "$WHONIX_DIR/packages/anon-shared-build-fix-grub/usr/lib/anon-dist/chroot-scripts-post.d"
{ {
#su user -c "git branch qubes" || :;
#su user -c "git checkout qubes" || :;
sed -i 's/update-grub/:/g' 85_update_grub || :; sed -i 's/update-grub/:/g' 85_update_grub || :;
su user -c "dpkg-source --commit" || :; cd ../../../..;
su user -c "git commit -am 'removed grub-pc depend'" || :; su user -c "dpkg-source -q --commit . no_grub" || :;
#git add .
#su user -c "git commit -am 'removed grub-pc depend'" || :;
} }
popd popd
#pushd "$WHONIX_DIR/build-steps.d" pushd "$WHONIX_DIR/build-steps.d"
#{ {
# sed -i 's/ check_for_uncommited_changes/ #check_for_uncommited_changes/g' 1200_create-debian-packages; sed -i 's/ check_for_uncommited_changes/ #check_for_uncommited_changes/g' 1200_create-debian-packages;
#} }
#popd popd
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Whonix system config dependancies # Whonix system config dependancies
@ -246,9 +255,11 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
debug "Building Whonix..." debug "Building Whonix..."
mount --bind "../Whonix" "$INSTALLDIR/home/user/Whonix" mount --bind "../Whonix" "$INSTALLDIR/home/user/Whonix"
# This breaks whonix depends since it must just rely on recommended
# packages since it seems to install just about everything :)
# Install apt-get preferences # Install apt-get preferences
echo "$WHONIX_APT_PREFERENCE" > "$INSTALLDIR/etc/apt/apt.conf.d/99whonix" #echo "$WHONIX_APT_PREFERENCES" > "$INSTALLDIR/etc/apt/apt.conf.d/99whonix"
chmod 0644 "$INSTALLDIR/etc/apt/apt.conf.d/99whonix" #chmod 0644 "$INSTALLDIR/etc/apt/apt.conf.d/99whonix"
# Pin grub packages so they will not install # Pin grub packages so they will not install
echo "$WHONIX_APT_PIN" > "$INSTALLDIR/etc/apt/preferences.d/whonix_qubes" echo "$WHONIX_APT_PIN" > "$INSTALLDIR/etc/apt/preferences.d/whonix_qubes"

6
scripts_debian/packages_wheezy_whonix.list
View File

@ -7,6 +7,7 @@ ncurses-term
xserver-xorg-core xserver-xorg-core
x11-xserver-utils x11-xserver-utils
xinit xinit
git git
curl curl
sudo sudo
@ -27,3 +28,8 @@ usbutils
lsb-release lsb-release
acpi-support-base acpi-support-base
haveged haveged
build-essential:native
gcc
fakeroot
lintian