Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

intrigeri:
> Please do consider that it might be remotely possible that one did not
> understand your actions and emails the way you think they should have.

This shows that this is, indeed, a misunderstanding.

If it could have been possible (tails-persistence-setup would not have
been a blocker), I would have merged the branch directly to devel,
because I felt the patches written by Alessandro were good enough to be
included. They had been discussed on the mailing-list between Sep 22th
and Oct 15th and also with anonym over IRC. So yes, I assumed other
Tails developers had enough opportunity to look it up if they had time
and energy.

I have to acknowledge that you do not trust my judgement for such
matters.

> ["think positive" conclusion: "please review" in email subject helps.]

I will limit myself to such requests for the time being.

-- 
Ague


pgpRTDtCStSAc.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[intrigeri]

Hi,

Ague Mill wrote (14 Nov 2012 18:03:00 GMT) :
> The ticket was updated with the `todo/qa` tag in commit 9ce564b69a0
> on Oct 15th (nearly a month ago). It was labeled "Candidate for
> 0.15".

The commit message was: "Update status for persistent bookmarks".

Please take into account I am not reading every "status update" made
on the wiki to tickets about features I'm not working on, and we both
very well know that most Tails developers don't either. So I fail to
see why you think mentioning this change is relevant to the points,
needs and feelings I've raised.

> The same day, I had merged the branch in experimental and announced
> it on tails-dev, see:
> 

I think I now understand why you believe I should have seen/guessed it,
but I still see no explicit review and/or merge request in there.
Had I to read it again today, I would understand it the same way.

(

  It looks like a part of the misunderstanding might come from the
  fact you seem to rely on "merged into experimental => please
  review".

  It happens that we merge stuff into experimental before it is ready
  for a formal review request, even if we think the code is fine, e.g.
  because the documentation is not ready yet, or whatever other reason
  *I*, not closely following this feature's dev process, am not given
  to know. Hence the need for a *clear* review request. Else, I can
  very well wait a few more weeks for this request to come.

  https://tails.boum.org/contribute/git/#index6h3 reads:

experimental

Generally, it's devel plus a few topic branches merged in.
These topic branches are not ready enough to be merged into devel,
but we seriously would like to get them fit for the next stable
release, so this branch serves to test all these new features and
bugfixes by building / getting a single image.

  That's basically how we've been using experimental since we have it.
  Interestingly, now that we have the formal requirement to merge into
  experimental when asking for review/merge, less stuff gets merged
  into experimental before the formal review request.

)

> I am sorry that you missed it.

What happened is, apparently, a misunderstanding.

A misunderstanding is a shared problem.

I'm trying to express why I don't feel comfortable with the process
that happened, and I feel like you're throwing at me more or less
valid reasons why I'm just plain wrong, as if I was at fault not to
have understood what still looks unclear to me now.

Guess what: I'm *not* happy with that either.

Please do consider that it might be remotely possible that one did not
understand your actions and emails the way you think they should have.

["think positive" conclusion: "please review" in email subject helps.]

Cheers.
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

intrigeri:
> But, I'm sure that *giving a chance* to other Tails developers to look
> at a new feature *before it's merged*, without them having to follow
> each development iteration, should be something we take seriously:
> this is something I feed is needed to happily work together, to make
> it easier for less-involved people to participate, and to make our
> stuff better thanks to others' different skills and PoV.

The ticket was updated with the `todo/qa` tag in commit
9ce564b69a0 on Oct 15th (nearly a month ago). It was labeled "Candidate
for 0.15". The same day, I had merged the branch in experimental and
announced it on tails-dev, see:


The documentation was subsequently edited by sajolida two days later:


I am sorry that you missed it.

-- 
Ague


pgp9KygLgtH6d.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[intrigeri]

Hi!

Ague Mill wrote (14 Nov 2012 09:42:05 GMT) :
> intrigeri:
>> Ague Mill:
>> > `feature/persistent_bookmarks` confirmed working and merged in
>> > `devel`.
>> 
>> I'm very happy 0.15 will have this feature.
>> 
>> Nitpicking: did I miss the call for review?

> That feature was implemented by Alesandro. I took care of the review.
> [...]
> I took care of the package upload, removed the now integrated patch from
> the branch, checked once more that it was working as intended.

This is great.

> Do you think an extra review is required in that case?

(Speaking as myself, not as the WAN.)

I'm not sure I would put it that way.
But I'm sure the way it went is not entirely satisfying to me.

Please let me explain how things went from my PoV.

I followed the process that lead to this great new feature from
a remote standpoint; I did not want to closely follow every iteration,
so I was waiting for it to reach a "good enough" state to give it
a try and have a look at the implementation. Reaching this checkpoint
state is generally expressed in the form of a review request sent on
tails-dev. This did not happen, or I missed it (sorry if that's the
case, again), so it feels like the first chance I have to look at
something once it is considered good enough for merging is... after
it's merged, the day before a freeze. So, from my point of view, the
whole process feels like rushing things in in a way that does not
leave much room for peer-review.

Also, my impression was that, given the amount of guidance you have
provided to Alesandro during the implementation process, you almost
acted as a co-implementer, so the situation gets blurry.

I'm not sure what I think is *required* (I mean: by our agreed upon
rules) in such neither-black-nor-white situations. I'm not sure I want
stricter or more precise rules that deal with every kind of situation.
I'm quite sure I don't want to endlessly list more and more
formal requirements.

But, I'm sure that *giving a chance* to other Tails developers to look
at a new feature *before it's merged*, without them having to follow
each development iteration, should be something we take seriously:
this is something I feed is needed to happily work together, to make
it easier for less-involved people to participate, and to make our
stuff better thanks to others' different skills and PoV.

Cheers!
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

intrigeri:
> Ague Mill:
> > `feature/persistent_bookmarks` confirmed working and merged in
> > `devel`.
> 
> I'm very happy 0.15 will have this feature.
> 
> Nitpicking: did I miss the call for review?

That feature was implemented by Alesandro. I took care of the review.
The branch that was pushed was in a temporary state because it was
waiting for Tails 0.14 as an upload of tails-persistence-setup was
needed.

I took care of the package upload, removed the now integrated patch from
the branch, checked once more that it was working as intended.
Do you think an extra review is required in that case?

-- 
Ague


pgpW8Hk94fb23.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[intrigeri]

Ague Mill wrote (13 Nov 2012 21:41:25 GMT) :
> `feature/persistent_bookmarks` confirmed working and merged in
> `devel`.

I'm very happy 0.15 will have this feature.

Nitpicking: did I miss the call for review?

Cheers,
-- 
  intrigeri
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

Ague Mill:
> On Thu, Oct 11, 2012 at 11:11:14PM +0200, Alessandro Grassi wrote:
> > > Yes, it is too late. But don't worry, 0.15 should be out early
> > > December. :)  That gives us a little more room to have the
> > > documentation well polished and delivered with more translations.
> > 
> > Fine. I made a new patch for documentation, and symlink patch is fixed
> > to create the bookmarks folder. All the needed patches are attached.
> 
> Wonderful!
> 
> Everything works fine according to my tests, so  I have pushed your work
> in the `feature/persistent_bookmarks` branch and merged it in
> experimental.
> 
> Please note that I did not upload a customized tails-persistent-setup
> and relied on a patch instead, as I wanted to leave
> tails-persistent-setup alone until 0.14 is out.

New package built and uploaded. `feature/persistent_bookmarks` confirmed
working and merged in `devel`.

-- 
Ague


pgp7YMF2fwsXG.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[sajolida]

On 15/10/12 19:47, Ague Mill wrote:
> On Thu, Oct 11, 2012 at 11:11:14PM +0200, Alessandro Grassi wrote:
>>> Yes, it is too late. But don't worry, 0.15 should be out early
>>> December. :)  That gives us a little more room to have the
>>> documentation well polished and delivered with more translations.
>>
>> Fine. I made a new patch for documentation, and symlink patch is fixed
>> to create the bookmarks folder. All the needed patches are attached.
> 
> Wonderful!
> 
> Everything works fine according to my tests, so  I have pushed your work
> in the `feature/persistent_bookmarks` branch and merged it in
> experimental.
> 
> Please note that I did not upload a customized tails-persistent-setup
> and relied on a patch instead, as I wanted to leave
> tails-persistent-setup alone until 0.14 is out.

Nice documentation :)

I just fixed the .



signature.asc
Description: OpenPGP digital signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Alessandro Grassi]

2012/10/15, Ague Mill :
> Everything works fine according to my tests, so  I have pushed your work
> in the `feature/persistent_bookmarks` branch and merged it in
> experimental.

I'm glad it works. Thanks for your help :-)

Alessandro
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

On Thu, Oct 11, 2012 at 11:11:14PM +0200, Alessandro Grassi wrote:
> > Yes, it is too late. But don't worry, 0.15 should be out early
> > December. :)  That gives us a little more room to have the
> > documentation well polished and delivered with more translations.
> 
> Fine. I made a new patch for documentation, and symlink patch is fixed
> to create the bookmarks folder. All the needed patches are attached.

Wonderful!

Everything works fine according to my tests, so  I have pushed your work
in the `feature/persistent_bookmarks` branch and merged it in
experimental.

Please note that I did not upload a customized tails-persistent-setup
and relied on a patch instead, as I wanted to leave
tails-persistent-setup alone until 0.14 is out.

-- 
Ague


pgpy0w7UrUpOm.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Alessandro Grassi]

> Yes, it is too late. But don't worry, 0.15 should be out early
> December. :)  That gives us a little more room to have the
> documentation well polished and delivered with more translations.
> 
> -- 
> Ague

Fine. I made a new patch for documentation, and symlink patch is fixed to 
create the bookmarks folder. All the needed patches are attached.

Greetings
Alessandro
>From e173105a99a545f754d367325ef91714ac81d443 Mon Sep 17 00:00:00 2001
From: Tails developers 
Date: Fri, 5 Oct 2012 22:54:29 +0200
Subject: [PATCH] Added bookmarks preset

---
 lib/Tails/Persistence/Configuration/Presets.pm |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/Tails/Persistence/Configuration/Presets.pm b/lib/Tails/Persistence/Configuration/Presets.pm
index 5113828..ede4b24 100644
--- a/lib/Tails/Persistence/Configuration/Presets.pm
+++ b/lib/Tails/Persistence/Configuration/Presets.pm
@@ -114,6 +114,16 @@ method _build__presets {
 enabled => 0,
 icon_name   => 'network-wired',
 },
+	{
+name=> $self->encoding->decode(gettext(q{Browser bookmarks})),
+description => $self->encoding->decode(gettext(
+q{Bookmarks saved in Iceweasel browser}
+)),
+destination => '/home/amnesia/.mozilla/firefox/bookmarks',
+options => [ 'source=bookmarks' ],
+enabled => 0,
+icon_name   => 'user-bookmarks',
+},
 {
 name=> $self->encoding->decode(gettext(q{APT Packages})),
 description => $self->encoding->decode(gettext(
-- 
1.7.10.4

>From c8394e520dd15fdbf80bd1e2651a464499a4a010 Mon Sep 17 00:00:00 2001
From: Alessandro Grassi 
Date: Sun, 30 Sep 2012 20:09:08 +0200
Subject: [PATCH] generate iceweasel profile at build time

---
 config/chroot_local-hooks/14-generate-iceweasel-profile |   11 +++
 1 file changed, 11 insertions(+)
 create mode 100755 config/chroot_local-hooks/14-generate-iceweasel-profile

diff --git a/config/chroot_local-hooks/14-generate-iceweasel-profile b/config/chroot_local-hooks/14-generate-iceweasel-profile
new file mode 100755
index 000..d910076
--- /dev/null
+++ b/config/chroot_local-hooks/14-generate-iceweasel-profile
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#generate iceweasel profile at build time, so that it has a fixed name
+
+set -e
+apt-get --yes install xvfb
+xvfb-run iceweasel -CreateProfile default
+mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default
+sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini
+mv ~/.mozilla /etc/skel
+apt-get --yes purge xvfb
-- 
1.7.10.4

>From 8fe538046c192875522e4691aa67b5d01ff3677a Mon Sep 17 00:00:00 2001
From: Tails developers 
Date: Wed, 10 Oct 2012 19:31:49 +0200
Subject: [PATCH] symlink places.sqlite for bookmarks persistence

---
 config/chroot_local-hooks/15-symlink-places.sqlite |9 +
 1 file changed, 9 insertions(+)
 create mode 100755 config/chroot_local-hooks/15-symlink-places.sqlite

diff --git a/config/chroot_local-hooks/15-symlink-places.sqlite b/config/chroot_local-hooks/15-symlink-places.sqlite
new file mode 100755
index 000..3c39cff
--- /dev/null
+++ b/config/chroot_local-hooks/15-symlink-places.sqlite
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#create a symlink to places.sqlite in iceweasel profile
+#from a dedicated "bookmarks" directory, so that
+#it can be easily made persistent
+
+set -e
+ln -s /home/amnesia/.mozilla/firefox/bookmarks/places.sqlite /etc/skel/.mozilla/firefox/default/places.sqlite
+mkdir /etc/skel/.mozilla/firefox/bookmarks
-- 
1.7.10.4

>From 3bd7926a678d59be3861776b9f7da2d30b8e9b54 Mon Sep 17 00:00:00 2001
From: Tails developers 
Date: Thu, 11 Oct 2012 22:43:57 +0200
Subject: [PATCH 2/2] Documentation for bookmarks persistence

---
 wiki/src/contribute/design/persistence.mdwn |1 +
 wiki/src/doc/first_steps/persistence/configure.mdwn |   11 +++
 wiki/src/doc/first_steps/persistence/user-bookmarks.png |  Bin 0 -> 2399 bytes
 3 files changed, 12 insertions(+)
 create mode 100644 wiki/src/doc/first_steps/persistence/user-bookmarks.png

diff --git a/wiki/src/contribute/design/persistence.mdwn b/wiki/src/contribute/design/persistence.mdwn
index b75447a..efbce5c 100644
--- a/wiki/src/contribute/design/persistence.mdwn
+++ b/wiki/src/contribute/design/persistence.mdwn
@@ -24,6 +24,7 @@ This is relevant for the following applications:
 - GnuPG configuration
 - SSH client configuration
 - iceweasel certificate trust
+- iceweasel bookmarks
 - Pidgin configuration
 - MUA configuration
 - Tor's data/cache for faster bootstrap with slow connections and
diff --git a/wiki/src/doc/first_steps/persistence/configure.mdwn b/wiki/src/doc/first_steps/persistence/configure.mdwn
index 33b1b60..f85904a 100644
--- a/wiki/src/doc/first_steps/persistence/configure.mdwn
+++ b/wiki/src/doc/first_steps/persistence/configure.mdwn
@@ -204,6 +204,17 @@ The APT lists are needed to install additional
 progra

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

On Wed, Oct 10, 2012 at 07:03:20PM +0100, Alessandro Grassi wrote:
> > What is also needed before we can merge this work is an update to the
> > design documents and the end-user documentation, see
> >  for details.
> > Do you want to carry on your work on this front as well?
> 
> I'll do it ASAP, possibly 1 or 2 days. Is it too late to have this
> feature in 0.14?

Yes, it is too late. But don't worry, 0.15 should be out early
December. :)  That gives us a little more room to have the
documentation well polished and delivered with more translations.

-- 
Ague


pgpwY3U84lP1t.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Alessandro Grassi]

> This one should also create an empty directory in /etc/skel. Otherwise
> the 'bookmarks' directory will not exist when no persistence is used,
> resulting in a broken Iceweasel.

I missed it! Thank you!

> What is also needed before we can merge this work is an update to the
> design documents and the end-user documentation, see
>  for details.
> Do you want to carry on your work on this front as well?

I'll do it ASAP, possibly 1 or 2 days. Is it too late to have this
feature in 0.14?

Alessandro
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

On Fri, Oct 05, 2012 at 10:31:16PM +0100, Alessandro Grassi wrote:
> > Instead of using the 'link' option of the persistence framework, how
> > about using another directory, then? This would result in the following
> > approach:
> >
> >  * At build time:
> >- create an Iceweasel profile,
> >- create an empty `~/.mozilla/bookmarks` directory,
> >- remove `places.sqlite` from the Iceweasel profile,
> >- add a symlink `~/.mozilla/default/places.sqlite` pointing
> >  to `~/.mozilla/bookmarks/places.sqlite`.
> >  * When bookmarks persistence is activated:
> >- add `~/.mozilla/bookmarks` to the set of persistent directories.
> >
> > Wanna try it?
> 
> Looks a little tricky to me, but it works. Let's go this way! ;-)

Great. :)

> All the needed patches are attached:
> 
> "0001-generate-iceweasel-profile-at-build-time.patch" and
> "0001-symlink-places.sqlite-for-bookmarks-persistence.patch" are for
> Tails;

This one should also create an empty directory in /etc/skel. Otherwise
the 'bookmarks' directory will not exist when no persistence is used,
resulting in a broken Iceweasel.


What is also needed before we can merge this work is an update to the
design documents and the end-user documentation, see
 for details.
Do you want to carry on your work on this front as well?

Thanks for your contributions!
 
-- 
Ague


pgp6mnGZ1OKGM.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[intrigeri]

Hi,

Alessandro Grassi wrote (05 Oct 2012 21:31:16 GMT) :
> I noticed that .po and .pot files for t-p-s should be updated, [...]
> Are they updated on t-p-s build, or should I do that now?

"Now" is a bit too early, as other things might change in t-p-s until
these patches are merged, and it's no great fun to resolve conflicts
within PO files.

And "at build time" is a bit too late, as it does not give translators
the opportunity to do their job.

So, I guess we will update the PO files once we have applied
these patches. Thanks for caring about l10n!
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Alessandro Grassi]

> Instead of using the 'link' option of the persistence framework, how
> about using another directory, then? This would result in the following
> approach:
>
>  * At build time:
>- create an Iceweasel profile,
>- create an empty `~/.mozilla/bookmarks` directory,
>- remove `places.sqlite` from the Iceweasel profile,
>- add a symlink `~/.mozilla/default/places.sqlite` pointing
>  to `~/.mozilla/bookmarks/places.sqlite`.
>  * When bookmarks persistence is activated:
>- add `~/.mozilla/bookmarks` to the set of persistent directories.
>
> Wanna try it?

Looks a little tricky to me, but it works. Let's go this way! ;-)
All the needed patches are attached:

"0001-generate-iceweasel-profile-at-build-time.patch" and
"0001-symlink-places.sqlite-for-bookmarks-persistence.patch" are for
Tails;

"0001-Added-bookmarks-preset.patch" is for tails-persistence-setup;

I noticed that .po and .pot files for t-p-s should be updated, as they
refer to line numbers and some of those changed in Presets.pm, and I
added two gettext strings too. Are they updated on t-p-s build, or
should I do that now?

Greetings
Alessandro
From c8394e520dd15fdbf80bd1e2651a464499a4a010 Mon Sep 17 00:00:00 2001
From: Alessandro Grassi 
Date: Sun, 30 Sep 2012 20:09:08 +0200
Subject: [PATCH] generate iceweasel profile at build time

---
 config/chroot_local-hooks/14-generate-iceweasel-profile |   11 +++
 1 file changed, 11 insertions(+)
 create mode 100755 config/chroot_local-hooks/14-generate-iceweasel-profile

diff --git a/config/chroot_local-hooks/14-generate-iceweasel-profile b/config/chroot_local-hooks/14-generate-iceweasel-profile
new file mode 100755
index 000..d910076
--- /dev/null
+++ b/config/chroot_local-hooks/14-generate-iceweasel-profile
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#generate iceweasel profile at build time, so that it has a fixed name
+
+set -e
+apt-get --yes install xvfb
+xvfb-run iceweasel -CreateProfile default
+mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default
+sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini
+mv ~/.mozilla /etc/skel
+apt-get --yes purge xvfb
-- 
1.7.10.4

From 8b46486483acfd30767723c15c08642f4ec097f7 Mon Sep 17 00:00:00 2001
From: Tails developers 
Date: Fri, 5 Oct 2012 23:10:06 +0200
Subject: [PATCH] symlink places.sqlite for bookmarks persistence

---
 config/chroot_local-hooks/15-symlink-places.sqlite |8 
 1 file changed, 8 insertions(+)
 create mode 100755 config/chroot_local-hooks/15-symlink-places.sqlite

diff --git a/config/chroot_local-hooks/15-symlink-places.sqlite b/config/chroot_local-hooks/15-symlink-places.sqlite
new file mode 100755
index 000..688e80f
--- /dev/null
+++ b/config/chroot_local-hooks/15-symlink-places.sqlite
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+#create a symlink to places.sqlite in iceweasel profile
+#from a dedicated "bookmarks" directory, so that
+#it can be made persistent
+
+set -e
+ln -s /home/amnesia/.mozilla/firefox/bookmarks/places.sqlite /etc/skel/.mozilla/firefox/default/places.sqlite
-- 
1.7.10.4

From e173105a99a545f754d367325ef91714ac81d443 Mon Sep 17 00:00:00 2001
From: Tails developers 
Date: Fri, 5 Oct 2012 22:54:29 +0200
Subject: [PATCH] Added bookmarks preset

---
 lib/Tails/Persistence/Configuration/Presets.pm |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/Tails/Persistence/Configuration/Presets.pm b/lib/Tails/Persistence/Configuration/Presets.pm
index 5113828..ede4b24 100644
--- a/lib/Tails/Persistence/Configuration/Presets.pm
+++ b/lib/Tails/Persistence/Configuration/Presets.pm
@@ -114,6 +114,16 @@ method _build__presets {
 enabled => 0,
 icon_name   => 'network-wired',
 },
+	{
+name=> $self->encoding->decode(gettext(q{Browser bookmarks})),
+description => $self->encoding->decode(gettext(
+q{Bookmarks saved in Iceweasel browser}
+)),
+destination => '/home/amnesia/.mozilla/firefox/bookmarks',
+options => [ 'source=bookmarks' ],
+enabled => 0,
+icon_name   => 'user-bookmarks',
+},
 {
 name=> $self->encoding->decode(gettext(q{APT Packages})),
 description => $self->encoding->decode(gettext(
-- 
1.7.10.4

___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

Re: [Tails-dev] Bookmarks persistence - help needed

[Ague Mill]

Hi Alessandro,

On Fri, Oct 05, 2012 at 11:49:20AM +0100, Alessandro Grassi wrote:
> attached patch "0001-Added-bookmarks-preset.patch" adds a "Browser
> bookmarks" preset in tails-persistence-setup.
> 
> It creates a "bookmarks" folder in the persistent volume and links
> files from this folder to /home/amnesia/.mozilla/firefox/default. It
> needs the "0001-generate-iceweasel-profile-at-build-time.patch" to be
> applied to Tails (see "generate Iceweasel profile at build time"
> discussion).

I suggest you always send the full patch series for review. It's small
enough it make sure there is no misunderstandings in which version of
the previously sent patches should be used.

> The "bookmarks" folder is supposed to contain the "places.sqlite" file
> alone. If it's not there when preset is turned on, a default one
> should be copied (creating an empty file won't work).

Having an empty file also did not work in my own tests. What worked was
to have a `places.sqlite` that was a symlink. When it was pointing to a
non-existent file, Iceweasel happily proceeded to create the file from
the default settings.

Instead of using the 'link' option of the persistence framework, how
about using another directory, then? This would result in the following
approach:

 * At build time:
   - create an Iceweasel profile,
   - create an empty `~/.mozilla/bookmarks` directory,
   - remove `places.sqlite` from the Iceweasel profile,
   - add a symlink `~/.mozilla/default/places.sqlite` pointing
 to `~/.mozilla/bookmarks/places.sqlite`.
 * When bookmarks persistence is activated:
   - add `~/.mozilla/bookmarks` to the set of persistent directories.

Wanna try it?
 
-- 
Ague


pgpRRwAqKUfO2.pgp
Description: PGP signature
___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev

[Tails-dev] Bookmarks persistence - help needed

[Alessandro Grassi]

Hi devs,
attached patch "0001-Added-bookmarks-preset.patch" adds a "Browser
bookmarks" preset in tails-persistence-setup.

It creates a "bookmarks" folder in the persistent volume and links
files from this folder to /home/amnesia/.mozilla/firefox/default. It
needs the "0001-generate-iceweasel-profile-at-build-time.patch" to be
applied to Tails (see "generate Iceweasel profile at build time"
discussion).

The "bookmarks" folder is supposed to contain the "places.sqlite" file
alone. If it's not there when preset is turned on, a default one
should be copied (creating an empty file won't work). I think it can
be done in the "go_button_pressed" method in
lib/Tails/Persistence/Step/Configure.pm, but I'm not confident with
perl. Hope someone else can do it.

Greetings
Alessandro
From 701d39c9645ecb52cddb776a0ce9ee6f4fee08a7 Mon Sep 17 00:00:00 2001
From: Tails developers 
Date: Fri, 5 Oct 2012 12:11:12 +0200
Subject: [PATCH] Added bookmarks preset

---
 lib/Tails/Persistence/Configuration/Presets.pm |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/Tails/Persistence/Configuration/Presets.pm b/lib/Tails/Persistence/Configuration/Presets.pm
index 5113828..5fd45da 100644
--- a/lib/Tails/Persistence/Configuration/Presets.pm
+++ b/lib/Tails/Persistence/Configuration/Presets.pm
@@ -114,6 +114,16 @@ method _build__presets {
 enabled => 0,
 icon_name   => 'network-wired',
 },
+	{
+name=> $self->encoding->decode(gettext(q{Browser bookmarks})),
+description => $self->encoding->decode(gettext(
+q{Bookmarks saved in Iceweasel browser}
+)),
+destination => '/home/amnesia/.mozilla/firefox/default',
+options => [ 'source=bookmarks', "link" ],
+enabled => 0,
+icon_name   => 'user-bookmarks',
+},
 {
 name=> $self->encoding->decode(gettext(q{APT Packages})),
 description => $self->encoding->decode(gettext(
-- 
1.7.10.4

From c8394e520dd15fdbf80bd1e2651a464499a4a010 Mon Sep 17 00:00:00 2001
From: Alessandro Grassi 
Date: Sun, 30 Sep 2012 20:09:08 +0200
Subject: [PATCH] generate iceweasel profile at build time

---
 config/chroot_local-hooks/14-generate-iceweasel-profile |   11 +++
 1 file changed, 11 insertions(+)
 create mode 100755 config/chroot_local-hooks/14-generate-iceweasel-profile

diff --git a/config/chroot_local-hooks/14-generate-iceweasel-profile b/config/chroot_local-hooks/14-generate-iceweasel-profile
new file mode 100755
index 000..d910076
--- /dev/null
+++ b/config/chroot_local-hooks/14-generate-iceweasel-profile
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#generate iceweasel profile at build time, so that it has a fixed name
+
+set -e
+apt-get --yes install xvfb
+xvfb-run iceweasel -CreateProfile default
+mv ~/.mozilla/firefox/*.default ~/.mozilla/firefox/default
+sed -i "s@Path=.*\.default@Path=default@" ~/.mozilla/firefox/profiles.ini
+mv ~/.mozilla /etc/skel
+apt-get --yes purge xvfb
-- 
1.7.10.4

___
tails-dev mailing list
tails-dev@boum.org
https://mailman.boum.org/listinfo/tails-dev