nrgaway
10 years ago
commit
b37711b876
@ -0,0 +1,21 @@
|
||||
gnome-terminal.desktop
|
||||
nautilus.desktop
|
||||
yelp.desktop
|
||||
gateway-arm.desktop
|
||||
gateway-firewall30default.desktop
|
||||
gateway-firewall50user.desktop
|
||||
gateway-firsttimesetup.desktop
|
||||
gateway-reloadfirewall.desktop
|
||||
gateway-reloadtor.desktop
|
||||
gateway-restarttor.desktop
|
||||
gateway-stoptor.desktop
|
||||
gateway-torrc.desktop
|
||||
gateway-torrcexamples.desktop
|
||||
timesync.desktop
|
||||
whonixcheck.desktop
|
||||
whonix_repository.desktop
|
||||
dolphin.desktop
|
||||
Help.desktop
|
||||
ksystemlog.desktop
|
||||
kwrite.desktop
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
gnome-terminal.desktop
|
||||
nautilus.desktop
|
||||
yelp.desktop
|
||||
gateway-arm.desktop
|
||||
gateway-firewall30default.desktop
|
||||
gateway-firewall50user.desktop
|
||||
gateway-firsttimesetup.desktop
|
||||
gateway-reloadfirewall.desktop
|
||||
gateway-reloadtor.desktop
|
||||
gateway-restarttor.desktop
|
||||
gateway-stoptor.desktop
|
||||
gateway-torrc.desktop
|
||||
gateway-torrcexamples.desktop
|
||||
timesync.desktop
|
||||
whonixcheck.desktop
|
||||
whonix_repository.desktop
|
||||
dolphin.desktop
|
||||
Help.desktop
|
||||
ksystemlog.desktop
|
||||
kwrite.desktop
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
gnome-terminal.desktop
|
||||
gpk-application.desktop
|
||||
gpk-update-viewer.desktop
|
||||
gpk-prefs.desktop
|
||||
gpk-log.desktop
|
||||
yelp.desktop
|
||||
gateway-firewall30default.desktop
|
||||
gateway-firewall50user.desktop
|
||||
gateway-torrc.desktop
|
||||
gateway-torrcexamples.desktop
|
||||
kwrite.desktop
|
||||
@ -0,0 +1 @@
|
||||
gnome-terminal.desktop
|
||||
@ -0,0 +1,27 @@
|
||||
gnome-terminal.desktop
|
||||
nautilus.desktop
|
||||
yelp.desktop
|
||||
|
||||
anondist-torbrowser.desktop
|
||||
anondist-torbrowser_update.desktop
|
||||
gateway-firsttimesetup.desktop
|
||||
timesync.desktop
|
||||
vlc.desktop
|
||||
whonixcheck.desktop
|
||||
whonix-contribute.desktop
|
||||
whonix-documentation.desktop
|
||||
whonix-donate.desktop
|
||||
whonix-featureblog.desktop
|
||||
whonix-forum.desktop
|
||||
whonix-importantblog.desktop
|
||||
whonix-irc-chat-support.desktop
|
||||
whonix-mailinglist.desktop
|
||||
whonix_repository.desktop
|
||||
xchat.desktop
|
||||
x-www-browser.desktop
|
||||
dolphin.desktop
|
||||
Help.desktop
|
||||
kcalc.desktop
|
||||
kgpg.desktop
|
||||
kwrite.desktop
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
gnome-terminal.desktop
|
||||
gpk-application.desktop
|
||||
gpk-update-viewer.desktop
|
||||
gpk-prefs.desktop
|
||||
gpk-log.desktop
|
||||
yelp.desktop
|
||||
|
||||
|
||||
anondist-torbrowser.desktop
|
||||
anondist-torbrowser_update.desktop
|
||||
bluetooth-sendto.desktop
|
||||
bluetooth-wizard.desktop
|
||||
brasero.desktop
|
||||
brasero-nautilus.desktop
|
||||
display.im6.desktop
|
||||
fpm2.desktop
|
||||
gateway-firsttimesetup.desktop
|
||||
gcr-prompter.desktop
|
||||
gcr-viewer.desktop
|
||||
gnome-terminal.desktop
|
||||
gpk-application.desktop
|
||||
gpk-dbus-service.desktop
|
||||
gpk-install-catalog.desktop
|
||||
gpk-install-local-file.desktop
|
||||
gpk-log.desktop
|
||||
gpk-prefs.desktop
|
||||
gpk-service-pack.desktop
|
||||
gpk-update-viewer.desktop
|
||||
iceweasel.desktop
|
||||
kde4
|
||||
mat.desktop
|
||||
mimeinfo.cache
|
||||
nact.desktop
|
||||
nautilus-autorun-software.desktop
|
||||
nautilus.desktop
|
||||
nm-applet.desktop
|
||||
nm-connection-editor.desktop
|
||||
python2.7.desktop
|
||||
timesync.desktop
|
||||
vlc.desktop
|
||||
whonixcheck.desktop
|
||||
whonix-contribute.desktop
|
||||
whonix-documentation.desktop
|
||||
whonix-donate.desktop
|
||||
whonix-featureblog.desktop
|
||||
whonix-forum.desktop
|
||||
whonix-importantblog.desktop
|
||||
whonix-irc-chat-support.desktop
|
||||
whonix-mailinglist.desktop
|
||||
whonix_repository.desktop
|
||||
xchat.desktop
|
||||
x-www-browser.desktop
|
||||
yelp.desktop
|
||||
|
||||
|
||||
akonaditray.desktop
|
||||
-rw-r--r-- 1 root root 5000 Jun 22 2012 ark.desktop
|
||||
dolphin.desktop
|
||||
gwenview.desktop
|
||||
Help.desktop
|
||||
jovieapp.desktop
|
||||
kcalc.desktop
|
||||
kdepasswd.desktop
|
||||
kdesystemsettings.desktop
|
||||
keditbookmarks.desktop
|
||||
kfind.desktop
|
||||
kfontview.desktop
|
||||
kgpg.desktop
|
||||
klipper.desktop
|
||||
kmag.desktop
|
||||
kmailservice.desktop
|
||||
kmix.desktop
|
||||
kmousetool.desktop
|
||||
kmouth.desktop
|
||||
konsole.desktop
|
||||
krandrtray.desktop
|
||||
ksysguard.desktop
|
||||
ksystemlog.desktop
|
||||
-rw-r--r-- 1 root root 1766 Jun 6 2012 ktelnetservice.desktop
|
||||
kvkbd.desktop
|
||||
kwrite.desktop
|
||||
nepomukbackup.desktop
|
||||
nepomukcontroller.desktop
|
||||
okularApplication_comicbook.desktop
|
||||
okularApplication_dvi.desktop
|
||||
okularApplication_fax.desktop
|
||||
okularApplication_fb.desktop
|
||||
okularApplication_ghostview.desktop
|
||||
okularApplication_kimgio.desktop
|
||||
okularApplication_ooo.desktop
|
||||
okularApplication_pdf.desktop
|
||||
okularApplication_plucker.desktop
|
||||
okularApplication_xps.desktop
|
||||
okular.desktop
|
||||
systemsettings.desktop
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Package: grub-pc
|
||||
Pin: version *
|
||||
Pin-Priority: -100
|
||||
|
||||
Package: grub-pc-bin
|
||||
Pin: version *
|
||||
Pin-Priority: -100
|
||||
|
||||
Package: grub-common
|
||||
Pin: version *
|
||||
Pin-Priority: -100
|
||||
|
||||
Package: grub2-common
|
||||
Pin: version *
|
||||
Pin-Priority: -100
|
||||
@ -0,0 +1,58 @@
|
||||
#!/bin/bash
|
||||
|
||||
#
|
||||
# To umount all binds, just pass any arg in $1
|
||||
#
|
||||
|
||||
. /usr/lib/whonix/utility_functions
|
||||
|
||||
# Don't run if started as a template
|
||||
if ! [ "${WHONIX}" == "template" ]; then
|
||||
# Array of directories to bind
|
||||
BINDS=(
|
||||
'/rw/srv/whonix/root/.whonix:/root/.whonix'
|
||||
'/rw/srv/whonix/root/.whonix.d:/root/.whonix.d'
|
||||
'/rw/srv/whonix/var/lib/whonix:/var/lib/whonix'
|
||||
'/rw/srv/whonix/var/lib/whonixcheck:/var/lib/whonixcheck'
|
||||
'/rw/srv/whonix/etc/tor:/etc/tor'
|
||||
)
|
||||
|
||||
for bind in ${BINDS[@]}; do
|
||||
rw_dir="${bind%%:*}"
|
||||
ro_dir="${bind##*:}"
|
||||
|
||||
# Make sure ro directory is not mounted
|
||||
umount "${ro_dir}" 2> /dev/null || true
|
||||
|
||||
if [ -n "${1}" ]; then
|
||||
echo "Umounting only..."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Make sure ro directory exists
|
||||
if ! [ -d "${ro_dir}" ]; then
|
||||
mkdir -p "${ro_dir}"
|
||||
fi
|
||||
|
||||
# Initially copy over data directories to /rw if rw directory does not exist
|
||||
if ! [ -d "${rw_dir}" ]; then
|
||||
mkdir -p "${rw_dir}"
|
||||
rsync -hax "${ro_dir}/." "${rw_dir}"
|
||||
fi
|
||||
|
||||
# Bind the directory
|
||||
sync
|
||||
mount --bind "${rw_dir}" "${ro_dir}"
|
||||
done
|
||||
sync
|
||||
fi
|
||||
|
||||
if [ "${WHONIX}" == "gateway" ]; then
|
||||
# Make sure we remove whonixsetup.done if Tor is not enabled
|
||||
# to allow choice of repo and prevent whonixcheck errors
|
||||
grep "^DisableNetwork 0$" /etc/tor/torrc || {
|
||||
sudo rm -f /var/lib/whonix/do_once/whonixsetup.done
|
||||
}
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@ -0,0 +1,14 @@
|
||||
[Unit]
|
||||
Description=Qubes Whonix bind /rw to ro dirs script
|
||||
DefaultDependencies=no
|
||||
Before=sysinit.target
|
||||
After=qubes-sysinit.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/lib/whonix/init/bind-dirs.sh
|
||||
StandardOutput=syslog
|
||||
|
||||
[Install]
|
||||
WantedBy=sysinit.target
|
||||
@ -0,0 +1,18 @@
|
||||
[Unit]
|
||||
Description=Checks many important aspects of Whonix.
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStartPre=/usr/bin/install -m 0775 -d --owner user --group user /var/run/whonixcheck
|
||||
ExecStartPre=/usr/bin/install -m 0775 -d --owner user --group user /var/lib/whonixcheck
|
||||
ExecStartPre=/usr/bin/install -m 0775 -d --owner user --group user /var/lib/whonix/whonixblog
|
||||
ExecStart=/usr/lib/whonixcheckdaemon
|
||||
PIDFile=/var/run/whonixcheck.pid
|
||||
User=user
|
||||
Group=user
|
||||
UMask=0007
|
||||
StandardOutput=syslog
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -0,0 +1,58 @@
|
||||
#!/bin/bash
|
||||
|
||||
#
|
||||
# To umount all binds, just pass any arg in $1
|
||||
#
|
||||
|
||||
. /usr/lib/whonix/utility_functions
|
||||
|
||||
# Don't run if started as a template
|
||||
if ! [ "${WHONIX}" == "template" ]; then
|
||||
# Array of directories to bind
|
||||
BINDS=(
|
||||
'/rw/srv/whonix/root/.whonix:/root/.whonix'
|
||||
'/rw/srv/whonix/root/.whonix.d:/root/.whonix.d'
|
||||
'/rw/srv/whonix/var/lib/whonix:/var/lib/whonix'
|
||||
'/rw/srv/whonix/var/lib/whonixcheck:/var/lib/whonixcheck'
|
||||
'/rw/srv/whonix/etc/tor:/etc/tor'
|
||||
)
|
||||
|
||||
for bind in ${BINDS[@]}; do
|
||||
rw_dir="${bind%%:*}"
|
||||
ro_dir="${bind##*:}"
|
||||
|
||||
# Make sure ro directory is not mounted
|
||||
umount "${ro_dir}" 2> /dev/null || true
|
||||
|
||||
if [ -n "${1}" ]; then
|
||||
echo "Umounting only..."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Make sure ro directory exists
|
||||
if ! [ -d "${ro_dir}" ]; then
|
||||
mkdir -p "${ro_dir}"
|
||||
fi
|
||||
|
||||
# Initially copy over data directories to /rw if rw directory does not exist
|
||||
if ! [ -d "${rw_dir}" ]; then
|
||||
mkdir -p "${rw_dir}"
|
||||
rsync -hax "${ro_dir}/." "${rw_dir}"
|
||||
fi
|
||||
|
||||
# Bind the directory
|
||||
sync
|
||||
mount --bind "${rw_dir}" "${ro_dir}"
|
||||
done
|
||||
sync
|
||||
fi
|
||||
|
||||
if [ "${WHONIX}" == "gateway" ]; then
|
||||
# Make sure we remove whonixsetup.done if Tor is not enabled
|
||||
# to allow choice of repo and prevent whonixcheck errors
|
||||
grep "^DisableNetwork 0$" /etc/tor/torrc || {
|
||||
sudo rm -f /var/lib/whonix/do_once/whonixsetup.done
|
||||
}
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Loading…
Reference in new issue