Changeset d0d2c85a

Timestamp:

06/03/2021 11:38:32 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

e92e7dc

Parents:

2eb2948

Message:

logrotate, pciutils, usbutils: Change the systemd units/timers to
install in /usr/lib instead of /lib, for consistency with other related
merged-/usr changes.

Files:

• general/sysutils/logrotate.xml (modified) (2 diffs)
• general/sysutils/pciutils.xml (modified) (2 diffs)
• general/sysutils/usbutils.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/sysutils/logrotate.xml

@@ -252 +252 @@
 chmod 754 /etc/cron.daily/logrotate.sh</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/logrotate.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/logrotate.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Runs the logrotate command
@@ -265 +265 @@
 ExecStart=/usr/sbin/logrotate /etc/logrotate.conf</literal>
 EOF
-cat &gt; /lib/systemd/system/logrotate.timer &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /usr/lib/systemd/system/logrotate.timer &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Runs the logrotate command daily at 3:00 AM

general/sysutils/pciutils.xml

@@ -164 +164 @@
 chmod 754 /etc/cron.weekly/update-pciids.sh</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-pciids.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/update-pciids.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update pci.ids file
@@ -177 +177 @@
 ExecStart=/usr/sbin/update-pciids</literal>
 EOF
-cat &gt; /lib/systemd/system/update-pciids.timer &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /usr/lib/systemd/system/update-pciids.timer &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update pci.ids file weekly

general/sysutils/usbutils.xml

@@ -182 +182 @@
 chmod 754 /etc/cron.weekly/update-usbids.sh</userinput></screen>
 
-<screen role="root" revision="systemd"><userinput>cat &gt; /lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;
+<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/update-usbids.service &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update usb.ids file
@@ -195 +195 @@
 ExecStart=/usr/bin/wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</literal>
 EOF
-cat &gt; /lib/systemd/system/update-usbids.timer &lt;&lt; "EOF" &amp;&amp;
+cat &gt; /usr/lib/systemd/system/update-usbids.timer &lt;&lt; "EOF" &amp;&amp;
 <literal>[Unit]
 Description=Update usb.ids file weekly

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>June 3rd, 2021</para>
       <itemizedlist>
+        <listitem revision="systemd">
+          <para>[renodr] - Adapt the timer/unit creation for pciutils, usbutils,
+          and logrotate to the merged-/usr changes.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Adapt cracklib to merged-/usr changes.</para>