Changeset d1ea8a45


Ignore:
Timestamp:
07/19/2014 11:32:06 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
4da2d9f
Parents:
beda3f33
Message:

Begin merging Christophers work into systemd branch part 1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13486 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
2 added
1 deleted
9 edited
6 moved

Legend:

Unmodified
Added
Removed

  • general/sysutils/sysutils.xml

    rbeda3f33 rd1ea8a45  
    4545  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/>
    4646  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
     47  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
    4748  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev-extras.xml"/>
    4849  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.xml"/>

  • introduction/important/important.xml

    rbeda3f33 rd1ea8a45  
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="position.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patches.xml"/>
    28   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
     28  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts-systemd.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraries.xml"/>
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale-issues.xml"/>

  • kde/core/core.xml

    rbeda3f33 rd1ea8a45  
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-baseapps.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-base-artwork.xml"/>
    40   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace.xml"/>
     40  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace-systemd.xml"/>
    4141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
    4242

  • kde/core/kde-workspace-systemd.xml

    rbeda3f33 rd1ea8a45  
    8989      <xref linkend="freetype2"/>,
    9090      <xref linkend="pciutils"/>, and
    91       <xref linkend="consolekit"/>
     91      <xref linkend="systemd"/> (for Logind)
    9292    </para>
    9393

  • lxde/desktop/desktop.xml

    rbeda3f33 rd1ea8a45  
    4242  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxpolkit.xml"/>
    4343  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxsession.xml"/>
    44   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-common.xml"/>
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-common-systemd.xml"/>
    4545
    4646</chapter>

  • lxde/desktop/lxde-common-systemd.xml

    rbeda3f33 rd1ea8a45  
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="consolekit"/>,
    7877      <xref linkend="lxde-icon-theme"/>,
    7978      <xref linkend="lxpanel"/>,
    8079      <xref linkend="lxsession"/>,
    81       <xref linkend="openbox"/> (runtime), and
    82       <xref linkend="pcmanfm"/>
     80      <xref linkend="openbox"/>,
     81      <xref linkend="pcmanfm"/>, and
     82      <xref linkend="systemd"/> (for Logind)
    8383    </para>
    8484

  • networking/netutils/netutils.xml

    rbeda3f33 rd1ea8a45  
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind-utils.xml"/>
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mod_dnssd.xml"/>
    27   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkmanager.xml"/>
     27  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkmanager-systemd.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nmap.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="traceroute.xml"/>

  • networking/netutils/networkmanager-systemd.xml

    rbeda3f33 rd1ea8a45  
    9090    <bridgehead renderas="sect4">Recommended</bridgehead>
    9191    <para role="recommended">
    92       <xref linkend="consolekit"/>,
    9392      <xref linkend="dhcpcd"/> or
    9493      <xref linkend="dhcp"/> (client only),
    … …  
    9897      <xref linkend="newt"/> (for <command>nmtui</command>),
    9998      <xref linkend="polkit"/>,
    100       <xref linkend="upower"/>, and
     99      <xref linkend="systemd"/> (for Logind), and
    101100      <xref linkend="vala"/>
    102101    </para>

  • postlfs/config/config.xml

    rbeda3f33 rd1ea8a45  
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="users.xml"/>
    5050  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devices.xml"/>
    51   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
     51  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile-systemd.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>

  • postlfs/config/profile-systemd.xml

    rbeda3f33 rd1ea8a45  
    314314    </indexterm>
    315315
    316       <para>This script sets an environment variable necessary for
    317       native language support. A full discussion on determining this
    318       variable can be found on the <ulink
    319       url="&lfs-root;/chapter07/profile.html">LFS Bash Shell
    320       Startup Files</ulink> page.</para>
     316      <para>This script sets environment variables necessary for
     317      native language support.</para>
    321318
    322319<screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
    323 <literal># Set up i18n variables
    324 export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable></literal>
     320<literal># Begin /etc/profile.d/i18n.sh
     321
     322unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
     323      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
     324
     325if [ -n "$XDG_CONFIG_HOME" ] &amp;&amp; [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
     326  . "$XDG_CONFIG_HOME/locale.conf"
     327elif [ -r /etc/locale.conf ]; then
     328  . /etc/locale.conf
     329fi
     330
     331export LANG="${LANG:-C}"
     332[ -n "$LC_CTYPE" ]          &amp;&amp; export LC_CTYPE
     333[ -n "$LC_NUMERIC" ]        &amp;&amp; export LC_NUMERIC
     334[ -n "$LC_TIME" ]           &amp;&amp; export LC_TIME
     335[ -n "$LC_COLLATE" ]        &amp;&amp; export LC_COLLATE
     336[ -n "$LC_MONETARY" ]       &amp;&amp; export LC_MONETARY
     337[ -n "$LC_MESSAGES" ]       &amp;&amp; export LC_MESSAGES
     338[ -n "$LC_PAPER" ]          &amp;&amp; export LC_PAPER
     339[ -n "$LC_NAME" ]           &amp;&amp; export LC_NAME
     340[ -n "$LC_ADDRESS" ]        &amp;&amp; export LC_ADDRESS
     341[ -n "$LC_TELEPHONE" ]      &amp;&amp; export LC_TELEPHONE
     342[ -n "$LC_MEASUREMENT" ]    &amp;&amp; export LC_MEASUREMENT
     343[ -n "$LC_IDENTIFICATION" ] &amp;&amp; export LC_IDENTIFICATION
     344
     345# End /etc/profile.d/i18n.sh</literal>
    325346EOF</userinput></screen>
    326347

  • postlfs/security/security.xml

    rbeda3f33 rd1ea8a45  
    4343  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.xml"/>
    4444  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cacerts.xml"/>
    45   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
    4645  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
    4746  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>

  • xfce/core/core.xml

    rbeda3f33 rd1ea8a45  
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfdesktop.xml"/>
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfwm4.xml"/>
    54   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session.xml"/>
     54  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session-systemd.xml"/>
    5555
    5656</chapter>

  • xfce/core/xfce4-session-systemd.xml

    rbeda3f33 rd1ea8a45  
    7575    </itemizedlist>
    7676
     77    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     78    <itemizedlist spacing="compact">
     79      <listitem>
     80        <para>
     81          Required patch:
     82          <ulink url="&patch-root;/xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch"/>
     83        </para>
     84      </listitem>
     85    </itemizedlist>
     86
    7787    <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
    7888
    … …  
    97107    </para>
    98108
    99 <screen><userinput>./configure --prefix=/usr \
     109<screen><userinput>patch -Np1 -i ..//xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch &amp;&amp;
     110./configure --prefix=/usr \
    100111            --sysconfdir=/etc \
    101112            --disable-legacy-sm &amp;&amp;
    … …  
    131142      There are several optional run time dependencies for
    132143      <application>Xfce4</application>:
    133       <xref linkend="consolekit"/>,
    134144      <xref linkend="dbus"/>,
    135145      <xref linkend="gnupg2"/>,
    136       <xref linkend="hicolor-icon-theme"/> and
    137       <xref linkend="openssh"/>
     146      <xref linkend="hicolor-icon-theme"/>,
     147      <xref linkend="openssh"/> and
     148      <xref linkend="systemd"/> (for Logind)
    138149    </para>
    139150
    140151    <para>
    141152      To launch <application>Xfce4</application> use the command
    142       <command>startxfce4</command>. If you have <xref linkend="consolekit"/>
    143       installed, use <command>startxfce4 --with-ck-launch</command>.
    144       <application>ConsoleKit</application> is required to perform any
    145       task that requires administrative access, including shut down
    146       and reboot.
     153      <command>startxfce4</command>.
    147154    </para>
    148155

  • xsoft/other/gparted-systemd.xml

    rbeda3f33 rd1ea8a45  
    189189          To optionally use <application>pkexec</application>, you need
    190190          <xref linkend="polkit-gnome"/> or <xref linkend="lxpolkit"/>, and
    191           <xref linkend="consolekit"/> installed with support to
     191          <xref linkend="systemd"/> installed with support to
    192192          <xref linkend="linux-pam"/> and <xref linkend="polkit"/>. As the
    193193          <systemitem class="username">root</systemitem> user, configure

  • xsoft/other/other.xml

    rbeda3f33 rd1ea8a45  
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp.xml"/>
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnash.xml"/>
    26   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted.xml"/>
     26  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted-systemd.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea-web.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape.xml"/>
Note: See TracChangeset for help on using the changeset viewer.