On Wed, 2014-12-03 at 22:07 +0100, Niels Thykier wrote: > On 2014-12-03 11:56, Svante Signell wrote: > > On Tue, 2014-12-02 at 23:01 +0100, Svante Signell wrote: > >> [...]
> > Index: en/issues.dbk > > =================================================================== > > --- en/issues.dbk (revision 10513) > > +++ en/issues.dbk (working copy) > > @@ -183,7 +183,7 @@ > > role="package">sysvinit-core</systemitem> or <systemitem > > role="package">upstart</systemitem>, it is recommended to setup > > APT pinning prior to the upgrade. As an example, to prevent > > - <systemitem role="package">systemd</systemitem> from being > > + <systemitem role="package">systemd-sysv</systemitem> from being > > Indeed, the package name is systemd-sysv. > Though perhaps we should change it to "systemd" without marking it as > a package. I presume that the user/admin is less interested in the > actual package name and more in the name of the init system. Problem is: Does the pinning work if it is on systemd instead of systemd-sysv? The the pin would be about any systemd component? > > installed during the upgrade, you can create a file called > > <filename>/etc/apt/preferences.d/local-pin-init</filename> with > > the following contents: > > @@ -193,12 +193,16 @@ > > Pin: release o=Debian > > Pin-Priority: -1 > > </screen> > > - <caution> > > - <para> > > - Be advised that some packages may have degraded behaviour or > > - may be lacking features under a non-default init system. > > - </para> > > - </caution> > > I am not too happy with pushing the <caution> down. To be honest, I > have been considering to push it "up". Pushed up, as you wish. > > + <note> > > I am not entirely convinced this should be a "<note>" rather than a > "<para>". Fixed by using <itemizedlist> instead! > > + It is also good to install > > It is also a good idea to install ...? Fixed! > > + <systemitem role="package"> sysvinit-core, sysvint and sysvinit-utils > > + </systemitem> as the first packages when upgrading. In case > > + you want an <emphasis>as-systemd-free-as-possible</emphasis> > > Not sure why the emphasis here. To be honest, the sentence strikes me > as a bit odd (and possibly a bit long). Maybe just add it to the list > above or simply just: > > """If you have a desktop environment installed, it is also recommended > to install systemd-shim to assist apt or/and aptitude with the upgrade > path.""" Rewritten! > > + desktop environment, it is also recommended to install <systemitem > > + role="package">systemd-shim</systemitem> in order to > > + help apt and aptitude to avoid installing systemd-sysv and > > + other *systemd* components, unintentionally. ^^^^^^^^^ Fixed! > Why the "*X*"? We got <emphasis> if you want to highlight. Then again, > see my previous remark about the entire sentence. New patch attached. Better now? Note the comment about the CTTE decision today (hopefully) about default init system on upgrades!
Index: en/issues.dbk =================================================================== --- en/issues.dbk (revision 10513) +++ en/issues.dbk (working copy) @@ -178,12 +178,16 @@ <para> Jessie ships with <systemitem role="package">systemd-sysv</systemitem> as - <emphasis>default</emphasis> init system. If you have a - preference for another init such as <systemitem + <emphasis>default</emphasis> init system. + This package is installed automatically on upgrades + <emphasis>(pending the CTTE decision today)</emphasis>. + </para> + <para> + If you have a preference for another init such as <systemitem role="package">sysvinit-core</systemitem> or <systemitem role="package">upstart</systemitem>, it is recommended to setup APT pinning prior to the upgrade. As an example, to prevent - <systemitem role="package">systemd</systemitem> from being + <systemitem role="package">systemd-sysv</systemitem> from being installed during the upgrade, you can create a file called <filename>/etc/apt/preferences.d/local-pin-init</filename> with the following contents: @@ -193,6 +197,11 @@ Pin: release o=Debian Pin-Priority: -1 </screen> + <para> + Please note that the upgrade may install packages containing + "systemd" in their name even with APT pinning. These alone do + <emphasis>not</emphasis> change your init system. + </para> <caution> <para> Be advised that some packages may have degraded behaviour or @@ -199,14 +208,32 @@ may be lacking features under a non-default init system. </para> </caution> + <itemizedlist> + <listitem> <para> - Please note that the upgrade may install packages containing - "systemd" in their name even with APT pinning. These alone do - <emphasis>not</emphasis> change your init system. To use - systemd as your init system, the <systemitem - role="package">systemd-sysv</systemitem> package must be - installed first. + It is also a good idea to install + <systemitem role="package"> sysvinit-core, sysvint and sysvinit-utils + </systemitem> as the first packages when upgrading. </para> + </listitem> + <listitem> + <para> + If you have a desktop environment installed, it is also + recommended to install <systemitem + role="package">systemd-shim</systemitem> to + </para> + <itemizedlist> + <listitem> <para> + assist apt and/or aptitude with the upgrade, + </para> </listitem> + <listitem> <para> + avoid getting <systemitem role="package">systemd-sysv</systemitem> + installed by mistake. + </para> </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <section id="systemd-auto-mounts-incompat"> <!-- Wheezy to Jessie --> <title>Stricter handling of failing mounts during boot under systemd</title>