On Mon, 2014-12-15 at 16:46 +0100, Joost van Baal-Ilić wrote: > Hi again Svante, > > On closer look of the proposed patch, I feel the tone is not right. > Text like > > apt-get dist-upgrade Wheezy to Jessie will get systemd-sysv installed, and > sysvinit will be history!! Otherwise you need to install sysvinit-core on > next > reboot (if your system boots). > > is not suitable for our release notes. The release notes should emphasise > default or very common scenarios. We assume most of our users to go with our > new default choice of systemd. Those preferring other init systems might in > general be better helped by e.g. pointing to a wiki page. I agree with what > Osamu Aoki wrote on december 3, in slightly different context. > > However, if you can supply _short_ and _simple_ instructions on how to upgrade > and keep the previously selected init-system, such instructions are likely > suitable. > > I was a bit put off by your use of "!!". I believe the 2 quoted sentences > could better be dropped. Care to minimise and adjust the patch? Sorry for > not > raising this earlier.
Hi I trimmed the patch, less text now. However, the LILO comment is still there. Do you want me to remove that one too?
Index: en/issues.dbk =================================================================== --- en/issues.dbk (revision 10513) +++ en/issues.dbk (working copy) @@ -178,12 +178,15 @@ <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 now installed automatically on upgrades. + </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 +196,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 +207,41 @@ 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> apt-get upgrade from Wheezy to Jessie can boot + with init=/lib/sysvinit/init until the old sysvinit package + is removed by e.g. autoclean. + </para> </listitem> + <listitem> <para> apt-get dist-upgrade Wheezy to Jessie will get + systemd-sysv installed, and sysvinit will be history. + </para> </listitem> + <listitem> <para> grub will get a new menu entry to boot with + init=/lib/sysvinit/init if something goes wrong with the switch to + systemd-sysv. If you are using some other bootloader, e.g. LILO you + are on your own. </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, + e.g. if you have forgotten to create the pinning file. </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>