On 06/04/2015 07:41 AM, Patrick Schleizer wrote:
> Hi Jason!
>> Was looking at your progress:
> https://github.com/nrgaway/qubes-whonix/tree/Whonix11
Thanks, I haven't even have time to review the code yet :) It still
needs some modifications for the whonix--tor-enable{disable} and I might
be able to eliminate the qubes-whonixsetup script completely; just takes
time to test. Today, I will be creating a pre-configuration manager
states (profile configurations) to allow Whonix to be installed with Tor
disabled and possibly create a new package for salt version 2015.5
(current is 2014.7)
In future, I do find it useful, and maybe less confusing to provide
comments on github. You are able to comment at each line of code. Not
sure if you are interested in doing this?
Also, I will include Joanna on this reply, but not future ones. I have
been taught not to include her in developer speak types of conversations
since she already receives way too much email.
Even Marek would not need to be included until its ready for merge or we
have some question that needs his input.
>>> # 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/cache/whonix-setup-wizard/status-files/whonixsetup.done
>> }
> Unless I am missing something, this won't work. There is a bug. 'var' ->
> '/var'
Yes, it appears it would not work. I need to re-add code to
qubes-whonixsetup as well to display whonix-setup-manager too. It'd in
the NOTES (TODO) in root directory.
> Drop sudo? Runs as root anyhow?
Yes
> Also not sure it's needed at all, because if
> - /var/cache/whonix-setup-wizard/status-files/whonixsetup.done exists +
> - /etc/tor/torrc contains 'DisableNetwork 0',
> then on Whonix-Gateway by Whonix / whonix-setup-wizard default, the
> following is started anyhow:
> 'whonix-setup-wizard setup'
I don't understand this point. The current whonix-setup-wizard is
over-ridden and runs manually in qubes-whonixsetup when needed. This is
something that may be able to be re-enabled due to recent improvements
of whonix-setup-wizard. As you can already see I have managed to remove
most manual depends within that file.
>> # Repository setup should only be run in template
>> if [ ! -e /var/cache/whonix-setup-wizard/status-files/whonix_repository.done ]; then
>> sudo touch /var/cache/whonix-setup-wizard/status-files/whonix_repository.done
>> fi
> Drop sudo? Runs as root anyhow?
>> Any reason for not
> '/var/cache/whonix-setup-wizard/status-files/whonix_repository.done' ->
> '/var/cache/whonix-setup-wizard/status-files/whonix_repository.skip'?
I can't remember off hand. At some point I had issues with whonixsetup
not running unless certain status-files existed.
> Also rather than 'touch
> /var/cache/whonix-setup-wizard/status-files/whonix_repository.skip' I
> think it would be best just ship the file
> var/cache/whonix-setup-wizard/status-files/whonix_repository.skip in the
> package.
>> From usr/lib/qubes-whonix/qubes-whonixsetup you would still be able to
> run /usr/bin/whonix-setup-wizard repository as you're doing now. [No
> modification of usr/lib/qubes-whonix/qubes-whonixsetup required for this.]
There is a good reason for using 'touch' :) If I provide that in the
package, the setting gets written to the TemplateVM and then the
TemplateVM will have the setting which means a user would not be
prompted to enable repo ever. This setting is only set in the AppVM and
when set only persists in the AppVM and therefore can not be set in the
package.
>> usr/lib/qubes-whonix/init/qubes-whonix-sysinit
> Drop sudo? Runs as root anyhow?
>>> subprocess.call(['systemctl', 'reload', 'tor'])
> 'reload' -> 'restart'? I guess that would be better due to this
> non-systemd-related(!) issue with 'reload' in upstream Tor:
> https://trac.torproject.org/projects/tor/ticket/16161
I was also thinking about this. This function will never be called
unless the script is run manually since it gets called before the
multiuser target now.
>> /usr/lib/qubes-whonix/init/qubes-whonix-sysinit
> Contains two times sudo. Drop sudo? Runs as root anyhow?
>>> license headers
> Not all scripts contain license headers.
I will clean that up when ready to merge into master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0x77DC3687.asc
Type: application/pgp-keys
Size: 6049 bytes
Desc: not available
URL: <http://www.whonix.org/pipermail/whonix-devel/attachments/20150604/01467e0f/attachment.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://www.whonix.org/pipermail/whonix-devel/attachments/20150604/01467e0f/attachment.sig>
More information about the Whonix-devel
mailing list
“Look here!” Dick began to chuckle. “We’ve got a queer combination to work with—our Sky Patrol has! Suspicious Sandy—and—Superstitious Jeff!” Sandy grinned ruefully, a little sheepishly. Larry smiled and shook his head, warning Dick not to carry his sarcasm any further, as Jeff frowned. 52 "You do doubt me. If you did not, it would never occur to you to deny it. You doubt me now, and you will doubt me still more if you don't read it. In justice to me you must." "That same. She was part Mescalero, anyway." This Act, as disgraceful as any which ever dishonoured the statute-book in the reigns of the Tudors or Stuarts, was introduced into the Commons, on the 12th of May, by Sir William Wyndham, and was resolutely opposed by the Whigs, amongst whom Sir Peter King, Sir Joseph Jekyll, Mr. Hampden, Robert Walpole, and General Stanhope distinguished themselves. They did not convince the majority, which amounted to no less than two hundred and thirty-seven to one hundred and twenty-six. In the Lords, Bolingbroke himself moved the second reading, and it was ably opposed by the Lords Cowper, Wharton, Halifax, Townshend, Nottingham, and others. The greatest curiosity was displayed regarding the part which Oxford would take, as it was known that in the Council he had endeavoured to soften the rigorous clauses; but in the House he followed his usual shuffling habit, declaring that he had not yet considered the question; and, having induced the Opposition to let the second reading pass without a division, he absented himself from the final voting, and thus disgusted both parties and hastened his own fall. The battle of Falkirk, which in itself appeared so brilliant an affair for Prince Charles, was really one of his most serious disasters. The Highlanders, according to their regular custom when loaded with plunder, went off in great numbers to their homes with their booty. His chief officers became furious against each other in discussing their respective merits in the battle. Lord George Murray, who had himself behaved most bravely in the field, complained that Lord John Drummond had not exerted himself, or pursuit might have been made and the royal army been utterly annihilated. This spirit of discontent was greatly aggravated by the siege of the castle of Stirling. Old General Blakeney, who commanded the garrison, declared he would hold out to the last man, in spite of the terrible threats of Lord George Murray if he did not surrender. The Highlanders grew disgusted with work so contrary to their habits; and, indeed, the French engineer, the so-called Marquis de Mirabelle, was so utterly ignorant of his profession, that the batteries which he constructed were commanded by the castle, and the men were so much exposed that they were in danger of being destroyed before they took the fortress. Accordingly, on the 24th of January they struck to a man, and refused to go any more into the trenches. "Haint we bit off more'n we kin chaw. Shorty?" asked Si, as he looked over the increasing gang. "Hadn't we better ask for some help?" "How far would it carry?" Corpril, Company Q, 2 Hundsrdth Injiamiy Volintear "He d?an't care much. F?ather, he likes to be comfortable, and this Inclosure w?an't make much difference to that. 'T?un't as if we wanted the pasture badly, and F?ather he d?an't care about land." "Byles," interrupted Calverley, speaking rapidly, "you are poor—you are in arrear with your rent; a distress will be levied, and then what will become of you—of your wife and the little one? Listen to me! I will give you money to keep a house over your head; and when I am steward, you shall have the first farm at my lord's disposal, if you will only aid me in my revenge! Revenge!" he repeated, vehemently—"but you hesitate—you refuse." "Yes, yes, there is little doubt of that: but how can we come at the truth? Sudbury still retains his wrath against us, and would oppose an arrest; and even could he be waylaid, and brought hither, he is stubborn, and might refuse to answer." HoME一级做人爱c视正版免费
ENTER NUMBET 0017 www.yinyi3.com.cn www.chizi8.net.cn tyck.com.cn ylzxxx.com.cn yiban8.com.cn www.buyan0.net.cn mazai5.net.cn riyao1.net.cn cywlcd.com.cn www.amswater.com.cn